Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/89481


Change subject: Pass Context to User::resetOptions
......................................................................

Pass Context to User::resetOptions

Change-Id: I0444777697ed9a8b8afdd0e5a96841848b162a7a
---
M includes/api/ApiOptions.php
M includes/specials/SpecialPreferences.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/89481/1

diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index b5aec77..7256066 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -54,7 +54,7 @@
                }
 
                if ( $params['reset'] ) {
-                       $user->resetOptions( $params['resetkinds'] );
+                       $user->resetOptions( $params['resetkinds'], 
$this->getContext() );
                        $changed = true;
                }
 
diff --git a/includes/specials/SpecialPreferences.php 
b/includes/specials/SpecialPreferences.php
index fe91ada..cc7b8fa 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -91,7 +91,7 @@
                }
 
                $user = $this->getUser();
-               $user->resetOptions( 'all' );
+               $user->resetOptions( 'all', $this->getContext() );
                $user->saveSettings();
 
                $url = $this->getTitle()->getFullURL( 'success' );

-- 
To view, visit https://gerrit.wikimedia.org/r/89481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0444777697ed9a8b8afdd0e5a96841848b162a7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to