From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 includes/api/ApiOptions.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'includes/api/ApiOptions.php')

diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index 8c996a26..7256066d 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -42,6 +42,10 @@ class ApiOptions extends ApiBase {
 			$this->dieUsage( 'Anonymous users cannot change preferences', 'notloggedin' );
 		}
 
+		if ( !$user->isAllowed( 'editmyoptions' ) ) {
+			$this->dieUsage( 'You don\'t have permission to edit your options', 'permissiondenied' );
+		}
+
 		$params = $this->extractRequestParams();
 		$changed = false;
 
@@ -50,7 +54,7 @@ class ApiOptions extends ApiBase {
 		}
 
 		if ( $params['reset'] ) {
-			$user->resetOptions( $params['resetkinds'] );
+			$user->resetOptions( $params['resetkinds'], $this->getContext() );
 			$changed = true;
 		}
 
@@ -83,7 +87,7 @@ class ApiOptions extends ApiBase {
 				case 'registered-checkmatrix':
 					// A key for a multiselect or checkmatrix option.
 					$validation = true;
-					$value = $value !== null ? (bool) $value : null;
+					$value = $value !== null ? (bool)$value : null;
 					break;
 				case 'userjs':
 					// Allow non-default preferences prefixed with 'userjs-', to be set by user scripts
-- 
cgit v1.2.2