Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60220
Change subject: Load only lib and client settings for client
......................................................................
Load only lib and client settings for client
Change-Id: Ibec2cec1190fceafdbd32872ed85ca223b45d097
---
M client/includes/WikibaseClient.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/20/60220/1
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 5b7ca2d..061ee73 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -235,7 +235,12 @@
* @return WikibaseClient
*/
public static function newInstance() {
- return new self( Settings::singleton(), defined(
'MW_PHPUNIT_TEST' ) );
+ $settings = new SettingsArray( array_merge(
+ $GLOBALS['wgWBSettings'],
+ $GLOBALS['wgWBClientSettings']
+ ) );
+
+ return new self( $settings, defined( 'MW_PHPUNIT_TEST' ) );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/60220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibec2cec1190fceafdbd32872ed85ca223b45d097
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
