From f61ef8760a181c613411da54f0cfb65f1ecf6990 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 19 Jul 2013 04:31:33 +0200 Subject: [PATCH] User#getOption: Check ignoreHidden before $wgHiddenPrefs Change-Id: Icb1aab8cd8dc15387d199bb51ca2cd72de6dba88 --- includes/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ); } -- 2.20.1