X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c6f1d01eda5dbf1b8c7d4ea2e75bd7b02dc11da9..8ccf941a82940d016e9c68bdf0c29e190953c7f7:/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 dc1188c4b..da194cad7 100644
--- a/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
+++ b/cookbooks/wiki/templates/default/mw-ext-Wikibase.inc.php.erb
@@ -38,10 +38,10 @@ call_user_func( function() {
     $wgWBRepoSettings['entityNamespaces']['property'] = WB_NS_PROPERTY;
 
     // Make sure we use the same keys on repo and clients, so we can share cached objects.
-    $wgWBRepoSettings['sharedCacheKeyPrefix'] = $wgDBname . ':WBL/' . rawurlencode( WBL_VERSION );
+    $wgWBRepoSettings['sharedCacheKeyPrefix'] = $wgDBname;
 
-    // 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.
@@ -49,6 +49,11 @@ call_user_func( function() {
 
     // these are the site_group codes as listed in the sites table
     $wgWBRepoSettings['specialSiteLinkGroups'] = ['osm'];
+
+    // This option will start working in Wikibase v1.33 release. Noop until then.
+    // https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/Wikibase/+/469872/
+    $wgWBRepoSettings['enableEntitySearchUI'] = false;
+
 } );
 
 // Adapted from "$IP/extensions/Wikibase/client/ExampleSettings.php";
@@ -61,6 +66,9 @@ call_user_func( function() {
 
 $wgWBClientSettings['namespaces'] = [ NS_MAIN ];
 
+// Avoid complaints that nobody seems to know the cause off...
+$wgWBClientSettings['entityUsagePerPageLimit'] = 500;
+                                  
 // no edit rights for anonymous users
 $wgGroupPermissions['*']['item-term'] = false;
 $wgGroupPermissions['*']['item-merge'] = false;
@@ -83,7 +91,3 @@ $wgGroupPermissions['data-admin']['property-create'] = true;
 
 // See https://www.mediawiki.org/wiki/Wikibase/Installation/Advanced_configuration#Define_links_for_external_identifiers
 $wgWBRepoSettings['formatterUrlProperty'] = 'P8';
-
-// ---- 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;