Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/215276
Change subject: Get rid of closure in PHP entry point
......................................................................
Get rid of closure in PHP entry point
Bug: T100177
Change-Id: If32adc1d9fc83cb936a010b1c18d0958433c6726
---
M GlobalPreferences.hooks.php
M GlobalPreferences.php
2 files changed, 11 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalPreferences
refs/changes/76/215276/1
diff --git a/GlobalPreferences.hooks.php b/GlobalPreferences.hooks.php
index 46b3d4c..23b4fea 100644
--- a/GlobalPreferences.hooks.php
+++ b/GlobalPreferences.hooks.php
@@ -26,6 +26,15 @@
);
/**
+ * @FIXME This is terrible
+ */
+ public static function onExtensionFunctions() {
+ global $wgHooks;
+ // Register this as late as possible!
+ $wgHooks['GetPreferences'][] =
'GlobalPreferencesHooks::onGetPreferences';
+ }
+
+ /**
* Load our global prefs
* @param User $user
* @param array $options
@@ -216,4 +225,4 @@
return true;
}
-}
\ No newline at end of file
+}
diff --git a/GlobalPreferences.php b/GlobalPreferences.php
index 33044df..d3273ae 100644
--- a/GlobalPreferences.php
+++ b/GlobalPreferences.php
@@ -44,11 +44,7 @@
$wgHooks['UserSaveOptions'][] = 'GlobalPreferencesHooks::onUserSaveOptions';
$wgHooks['PreferencesFormPreSave'][] =
'GlobalPreferencesHooks::onPreferencesFormPreSave';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'GlobalPreferencesHooks::onLoadExtensionSchemaUpdates';
-$wgExtensionFunctions[] = function() {
- global $wgHooks;
- // Register this as late as possible!
- $wgHooks['GetPreferences'][] =
'GlobalPreferencesHooks::onGetPreferences';
-};
+$wgExtensionFunctions[] = 'GlobalPreferencesHooks::onExtensionFunctions';
$wgResourceModules['ext.GlobalPreferences.special'] = array(
'styles' => 'ext.GlobalPreferences.special.css',
--
To view, visit https://gerrit.wikimedia.org/r/215276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If32adc1d9fc83cb936a010b1c18d0958433c6726
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalPreferences
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
