Include WB items in regular search results by dflt

[chef.git] / cookbooks / wiki / templates / default / mw-ext-Wikibase.inc.php.erb

diff --git a/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb b/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
index d4c2b975ce0e87e922fbd57053833e00c1efba57..e14dbea783a69217eb018901b6c284731f1b1989 100644 (file)
--- a/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
+++ b/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
@@ -40,8 +40,8 @@ call_user_func( function() {
     // Make sure we use the same keys on repo and clients, so we can share cached objects.
     $wgWBRepoSettings['sharedCacheKeyPrefix'] = $wgDBname . ':WBL/' . rawurlencode( WBL_VERSION );
 
-    // Tell MediaWiki to search the item namespace
-    // $wgNamespacesToBeSearchedDefault[WB_NS_ITEM] = true;
+    // Include Wikibase items in the regular search result by default
+    $wgNamespacesToBeSearchedDefault[WB_NS_ITEM] = true;
 
     // the special group includes all the sites in the specialSiteLinkGroups,
     // grouped together in a 'Pages linked to other sites' section.
@@ -81,9 +81,5 @@ $wgGroupPermissions['data-admin']['item-merge'] = true;
 $wgGroupPermissions['data-admin']['property-create'] = true;
 
 
-// ---- This should be set once formatUrl property is created
-// $wgWBRepoSettings['formatterUrlProperty'] = 'P3';
-
-// ---- This should be removed once all needed initial items and properties are set up
-$wgNamespaceProtection[WB_NS_ITEM] = [ 'create-wb-items' ];
-$wgGroupPermissions['data-admin']['create-wb-items'] = true;
+// See https://www.mediawiki.org/wiki/Wikibase/Installation/Advanced_configuration#Define_links_for_external_identifiers
+$wgWBRepoSettings['formatterUrlProperty'] = 'P8';