Jeroen De Dauw has submitted this change and it was merged.
Change subject: Fix $wgWBWikibase alias for PHP 5.5.
......................................................................
Fix $wgWBWikibase alias for PHP 5.5.
PHP 5.5 doesn't support referencing via the $GLOBALS array.
So do it in the file scope. That will only work if that is actually
the global scope, for for a B/C hack, that should be good enough.
Change-Id: Ie9549b35f89458acf8bb981a4433291446090634
---
M client/WikibaseClient.php
M repo/Wikibase.php
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 2583f0d..1dee99c 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -161,9 +161,9 @@
require( __DIR__ . '/config/WikibaseClient.default.php' )
);
- $GLOBALS['wgWBSettings'] =& $GLOBALS['wgWBClientSettings']; // B/C alias
-
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES
) {
include_once( $dir . 'config/WikibaseClient.experimental.php' );
}
} );
+
+$wgWBSettings =& $wgWBClientSettings; // B/C alias
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index f136876..b541afb 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -194,9 +194,9 @@
require( __DIR__ . '/config/Wikibase.default.php' )
);
- $GLOBALS['wgWBSettings'] =& $GLOBALS['wgWBRepoSettings']; // B/C alias
-
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES
) {
include_once( __DIR__ . '/config/Wikibase.experimental.php' );
}
} );
+
+$wgWBSettings =& $wgWBRepoSettings; // B/C alias
--
To view, visit https://gerrit.wikimedia.org/r/69320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9549b35f89458acf8bb981a4433291446090634
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
