Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110909
Change subject: Use new core 'PreferencesFormPreSave' hook
......................................................................
Use new core 'PreferencesFormPreSave' hook
No longer requires a custom patch for 1.23+ wikis
Change-Id: If4bab6780f8ef3fbabff2943ae41d472056128c7
Depends-On: Ibd8331c39afdde39b688d78f3faade2883f0c997
---
M GlobalPreferences.hooks.php
M GlobalPreferences.php
D patch.diff
3 files changed, 3 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalPreferences
refs/changes/09/110909/1
diff --git a/GlobalPreferences.hooks.php b/GlobalPreferences.hooks.php
index ff52b4f..c2d0730 100644
--- a/GlobalPreferences.hooks.php
+++ b/GlobalPreferences.hooks.php
@@ -86,7 +86,7 @@
return true;
}
- public static function onPreferencesFormSubmit( array $formData,
PreferencesForm $form, User $user, &$result ) {
+ public static function onPreferencesFormPreSave( array $formData,
PreferencesForm $form, User $user, &$result ) {
if ( !GlobalPreferences::onGlobalPrefsPage( $form ) ) {
// Don't interfere with local preferences
return true;
diff --git a/GlobalPreferences.php b/GlobalPreferences.php
index 9567b93..296b541 100644
--- a/GlobalPreferences.php
+++ b/GlobalPreferences.php
@@ -28,7 +28,7 @@
'author' => 'Kunal Mehta',
'url' => 'https://www.mediawiki.org/wiki/Extension:GlobalPreferences',
'descriptionmsg' => 'globalprefs-desc',
- 'version' => '0.0.3',
+ 'version' => '0.0.4',
);
$wgSpecialPages['GlobalPreferences'] = 'SpecialGlobalPreferences';
@@ -39,7 +39,7 @@
$wgHooks['UserLoadOptions'][] = 'GlobalPreferencesHooks::onUserLoadOptions';
$wgHooks['UserSaveOptions'][] = 'GlobalPreferencesHooks::onUserSaveOptions';
-$wgHooks['PreferencesFormSubmit'][] =
'GlobalPreferencesHooks::onPreferencesFormSubmit';
+$wgHooks['PreferencesFormPreSave'][] =
'GlobalPreferencesHooks::onPreferencesFormPreSave';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'GlobalPreferencesHooks::onLoadExtensionSchemaUpdates';
$wgExtensionFunctions[] = function() {
global $wgHooks;
diff --git a/patch.diff b/patch.diff
deleted file mode 100644
index 3ea4469..0000000
--- a/patch.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/includes/Preferences.php b/includes/Preferences.php
-index c9caf4f..9097a9a 100644
---- a/includes/Preferences.php
-+++ b/includes/Preferences.php
-@@ -1462,7 +1462,10 @@ class Preferences {
- $user->setOption( $key, $value );
- }
-
-- $user->saveSettings();
-+ if ( wfRunHooks( 'PreferencesFormSubmit', array(
$formData, $form, $user, &$result ) ) ) {
-+ $user->saveSettings();
-+ }
-+
- }
-
- $wgAuth->updateExternalDB( $user );
--
To view, visit https://gerrit.wikimedia.org/r/110909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4bab6780f8ef3fbabff2943ae41d472056128c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalPreferences
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
