User#getOption: Check ignoreHidden before $wgHiddenPrefs

Change-Id: Icb1aab8cd8dc15387d199bb51ca2cd72de6dba88

diff --git a/includes/User.php b/includes/User.php
index 685bce7..b09d79c 100644 (file)
--- 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 );
                }