jenkins-bot has submitted this change and it was merged.
Change subject: CacheKeyPrefix is not allowed to contain spaces any more
......................................................................
CacheKeyPrefix is not allowed to contain spaces any more
This is caused by a (unanounced?) breaking change in If3e20c6 and the
following patches.
Change-Id: Ia11c60703435171e24e2bedeef1b7b9c9d00279d
---
M client/config/WikibaseClient.default.php
M client/config/WikibaseClient.example.php
M client/tests/phpunit/ClientDefaultsTest.php
M repo/config/Wikibase.default.php
M repo/config/Wikibase.example.php
5 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/config/WikibaseClient.default.php
b/client/config/WikibaseClient.default.php
index 0e3cf71..5e9ea94 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -78,7 +78,7 @@
* which is 'wikibase_shared/' + deployment branch name + '-' +
repo database name, and have
* it set in both $wgWBClientSettings and $wgWBRepoSettings.
*/
- 'sharedCacheKeyPrefix' => 'wikibase_shared/' . WBL_VERSION .
'-' . $GLOBALS['wgDBname'],
+ 'sharedCacheKeyPrefix' => 'wikibase_shared/' . rawurlencode(
WBL_VERSION ) . '-' . $GLOBALS['wgDBname'],
/**
* The duration of the object cache, in seconds.
diff --git a/client/config/WikibaseClient.example.php
b/client/config/WikibaseClient.example.php
index 92e5d33..455fc9b 100644
--- a/client/config/WikibaseClient.example.php
+++ b/client/config/WikibaseClient.example.php
@@ -56,7 +56,7 @@
$wgWBClientSettings['showExternalRecentChanges'] = true;
// Make sure we use the same keys on repo and clients, so we can share cached
objects.
-$wgWBClientSettings['sharedCacheKeyPrefix'] =
$wgWBClientSettings['repoDatabase'] . ':WBL/' . WBL_VERSION;
+$wgWBClientSettings['sharedCacheKeyPrefix'] =
$wgWBClientSettings['repoDatabase'] . ':WBL/' . rawurlencode( WBL_VERSION );
// In order to access a remote repo using a different database server,
// LBFactoryMulti must be used. In that case, enabled the block below.
diff --git a/client/tests/phpunit/ClientDefaultsTest.php
b/client/tests/phpunit/ClientDefaultsTest.php
index a139d40..3636f0a 100644
--- a/client/tests/phpunit/ClientDefaultsTest.php
+++ b/client/tests/phpunit/ClientDefaultsTest.php
@@ -25,7 +25,7 @@
'siteGlobalID' => 'mywiki',
'repoDatabase' => 'foo',
'changesDatabase' => 'doo',
- 'sharedCacheKeyPrefix' =>
'wikibase_shared/' . WBL_VERSION,
+ 'sharedCacheKeyPrefix' =>
'wikibase_shared/' . rawurlencode( WBL_VERSION ),
),
array( // $wg
'wgServer' => 'http://www.acme.com',
@@ -41,7 +41,7 @@
'siteGlobalID' => 'mywiki',
'repoDatabase' => 'foo',
'changesDatabase' => 'doo',
- 'sharedCacheKeyPrefix' =>
'wikibase_shared/' . WBL_VERSION,
+ 'sharedCacheKeyPrefix' =>
'wikibase_shared/' . rawurlencode( WBL_VERSION ),
)
),
@@ -62,7 +62,7 @@
'siteGlobalID' => 'mw_mywiki',
'repoDatabase' => null,
'changesDatabase' => null,
- 'sharedCacheKeyPrefix' =>
'wikibase_shared/' . WBL_VERSION . '-mw_mywiki',
+ 'sharedCacheKeyPrefix' =>
'wikibase_shared/' . rawurlencode( WBL_VERSION ) . '-mw_mywiki',
)
),
@@ -74,7 +74,7 @@
'siteGlobalID' => 'mywiki',
'repoDatabase' => 'foo',
'changesDatabase' => 'doo',
- 'sharedCacheKeyPrefix' => 'foo:WBL/' .
WBL_VERSION,
+ 'sharedCacheKeyPrefix' => 'foo:WBL/' .
rawurlencode( WBL_VERSION ),
),
array( // $wg
'wgServer' => 'http://www.acme.com',
@@ -90,7 +90,7 @@
'siteGlobalID' => 'mywiki',
'repoDatabase' => 'foo',
'changesDatabase' => 'doo',
- 'sharedCacheKeyPrefix' => 'foo:WBL/' .
WBL_VERSION,
+ 'sharedCacheKeyPrefix' => 'foo:WBL/' .
rawurlencode( WBL_VERSION ),
)
),
@@ -111,7 +111,7 @@
'siteGlobalID' => 'mw_mywiki',
'repoDatabase' => false,
'changesDatabase' => false,
- 'sharedCacheKeyPrefix' =>
'wikibase_shared/' . WBL_VERSION . '-mw_mywiki',
+ 'sharedCacheKeyPrefix' =>
'wikibase_shared/' . rawurlencode( WBL_VERSION ) . '-mw_mywiki',
)
),
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 5863c8c..fe30007 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -121,7 +121,7 @@
* Please note that $wgWBClientSettings overrides settings such
as this one in the repo, if
* client is enabled on the same wiki.
*/
- 'sharedCacheKeyPrefix' => 'wikibase_shared/' . WBL_VERSION .
'-' . $GLOBALS['wgDBname'],
+ 'sharedCacheKeyPrefix' => 'wikibase_shared/' . rawurlencode(
WBL_VERSION ) . '-' . $GLOBALS['wgDBname'],
/**
* The duration of the object cache, in seconds.
diff --git a/repo/config/Wikibase.example.php b/repo/config/Wikibase.example.php
index 310ce95..11fe652 100644
--- a/repo/config/Wikibase.example.php
+++ b/repo/config/Wikibase.example.php
@@ -41,7 +41,7 @@
$wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_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/' .
WBL_VERSION;
+ $wgWBRepoSettings['sharedCacheKeyPrefix'] = $wgDBname . ':WBL/' .
rawurlencode( WBL_VERSION );
// NOTE: no need to set up $wgNamespaceContentModels, Wikibase will do
that automatically based on $wgWBRepoSettings
--
To view, visit https://gerrit.wikimedia.org/r/249443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia11c60703435171e24e2bedeef1b7b9c9d00279d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
