From: umherirrender <umherirrender_de.wp@web.de>
Date: Sat, 12 Oct 2013 20:48:26 +0000 (+0200)
Subject: Pass Context to User::resetOptions
X-Git-Tag: 1.31.0-rc.0~18530
X-Git-Url: http://git.cyclocoop.org/%22%20%20.%20generer_url_ecrire%28%22mots_tous%22%29%20.%20%22?a=commitdiff_plain;h=8523ff6c8187b6a29549587fbde46891a5cce815;p=lhc%2Fweb%2Fwiklou.git

Pass Context to User::resetOptions

Change-Id: I0444777697ed9a8b8afdd0e5a96841848b162a7a
---

diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index b5aec7716a..7256066d09 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -54,7 +54,7 @@ class ApiOptions extends ApiBase {
 		}
 
 		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 fe91adace3..cc7b8fae4f 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -91,7 +91,7 @@ class SpecialPreferences extends SpecialPage {
 		}
 
 		$user = $this->getUser();
-		$user->resetOptions( 'all' );
+		$user->resetOptions( 'all', $this->getContext() );
 		$user->saveSettings();
 
 		$url = $this->getTitle()->getFullURL( 'success' );