Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/227238
Change subject: Fix using GLOBALS in database updater ...................................................................... Fix using GLOBALS in database updater Some extension use GLOBALS. And those that use composer.json this patch fixes it. Change-Id: I460e0e899e2905387b1a3c2c0d00d182144bcbd4 --- M includes/installer/DatabaseUpdater.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/38/227238/1 diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index 702f850..d4c4057 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -148,11 +148,12 @@ if ( !$vars ) { return; // no LocalSettings found } - if ( !isset( $vars['wgHooks'] ) || !isset( $vars['wgHooks']['LoadExtensionSchemaUpdates'] ) ) { + if ( !isset( $vars['wgHooks'] ) || !isset( $vars['wgHooks']['LoadExtensionSchemaUpdates'] ) || $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'] ) { return; } global $wgHooks, $wgAutoloadClasses; $wgHooks['LoadExtensionSchemaUpdates'] = $vars['wgHooks']['LoadExtensionSchemaUpdates']; + $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'] = $GLOBALS['wgHooks']['LoadExtensionSchemaUpdates']; $wgAutoloadClasses = $wgAutoloadClasses + $vars['wgAutoloadClasses']; } -- To view, visit https://gerrit.wikimedia.org/r/227238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I460e0e899e2905387b1a3c2c0d00d182144bcbd4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits