From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 19 Jul 2013 02:31:33 +0000 (+0200)
Subject: User#getOption: Check ignoreHidden before $wgHiddenPrefs
X-Git-Tag: 1.31.0-rc.0~19126^2
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27user_edit%27%2C%20userid=session.user.id%29%20%7D%7D?a=commitdiff_plain;h=f61ef8760a181c613411da54f0cfb65f1ecf6990;p=lhc%2Fweb%2Fwiklou.git

User#getOption: Check ignoreHidden before $wgHiddenPrefs

Change-Id: Icb1aab8cd8dc15387d199bb51ca2cd72de6dba88
---

diff --git a/includes/User.php b/includes/User.php
index 685bce741f..b09d79cf7b 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2292,7 +2292,7 @@ class User {
 		# set it, and then it was disabled removing their ability to change it).  But
 		# we don't want to erase the preferences in the database in case the preference
 		# is re-enabled again.  So don't touch $mOptions, just override the returned value
-		if ( in_array( $oname, $wgHiddenPrefs ) && !$ignoreHidden ) {
+		if ( !$ignoreHidden && in_array( $oname, $wgHiddenPrefs ) ) {
 			return self::getDefaultOption( $oname );
 		}