Merge "Preferences.php: avoid "Undefined index" if key 'realname' don't exist in...

diff --combined includes/Preferences.php
index 10aa99d,b47115b..2d1529d
--- 1/includes/Preferences.php
--- 2/includes/Preferences.php
+++ b/includes/Preferences.php
@@@ -193,7 -193,7 +193,7 @@@ class Preferences 
         */
        static function profilePreferences( $user, IContextSource $context, &$defaultPreferences ) {
                global $wgAuth, $wgContLang, $wgParser, $wgCookieExpiration, $wgLanguageCode,
 -                      $wgDisableTitleConversion, $wgDisableLangConversion, $wgMaxSigChars,
 +                      $wgDisableLangConversion, $wgMaxSigChars,
                        $wgEnableEmail, $wgEmailConfirmToEdit, $wgEnableUserEmail, $wgEmailAuthentication,
                        $wgEnotifWatchlist, $wgEnotifUserTalk, $wgEnotifRevealEditorAddress,
                        $wgSecureLogin;
@@@ -381,6 -381,14 +381,6 @@@
                                                'section' => 'personal/i18n',
                                                'help-message' => 'prefs-help-variant',
                                        );
 -
 -                                      if ( !$wgDisableTitleConversion ) {
 -                                              $defaultPreferences['noconvertlink'] = array(
 -                                                      'type' => 'toggle',
 -                                                      'section' => 'personal/i18n',
 -                                                      'label-message' => 'tog-noconvertlink',
 -                                              );
 -                                      }
                                } else {
                                        $defaultPreferences["variant-$langCode"] = array(
                                                'type' => 'api',
@@@ -1410,7 -1418,7 +1410,7 @@@
  
                // 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 );
                }