Merge "Preferences.php: avoid "Undefined index" if key 'realname' don't exist in...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 19 Mar 2014 22:53:31 +0000 (22:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 19 Mar 2014 22:53:31 +0000 (22:53 +0000)
includes/Preferences.php

index 10aa99d..2d1529d 100644 (file)
@@ -1410,7 +1410,7 @@ class Preferences {
 
                // Fortunately, the realname field is MUCH simpler
                // (not really "private", but still shouldn't be edited without permission)
-               if ( !in_array( 'realname', $wgHiddenPrefs ) && $user->isAllowed( 'editmyprivateinfo' ) ) {
+               if ( !in_array( 'realname', $wgHiddenPrefs ) && $user->isAllowed( 'editmyprivateinfo' ) && array_key_exists( 'realname', $formData ) ) {
                        $realName = $formData['realname'];
                        $user->setRealName( $realName );
                }