Merge "Replace deprecated language codes in user options"

diff --combined includes/user/User.php
index 7c88598,7ad2742..4e6e83a
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -636,27 -636,6 +636,27 @@@ class User implements IDBAccessObject, 
                return $u;
        }
  
 +      /**
 +       * Returns a User object corresponding to the given UserIdentity.
 +       *
 +       * @since 1.32
 +       *
 +       * @param UserIdentity $identity
 +       *
 +       * @return User
 +       */
 +      public static function newFromIdentity( UserIdentity $identity ) {
 +              if ( $identity instanceof User ) {
 +                      return $identity;
 +              }
 +
 +              return self::newFromAnyId(
 +                      $identity->getId() === 0 ? null : $identity->getId(),
 +                      $identity->getName() === '' ? null : $identity->getName(),
 +                      $identity->getActorId() === 0 ? null : $identity->getActorId()
 +              );
 +      }
 +
        /**
         * Static factory method for creation from an ID, name, and/or actor ID
         *
@@@ -5518,6 -5497,11 +5518,11 @@@
                        }
                }
  
+               // Replace deprecated language codes
+               $this->mOptions['language'] = LanguageCode::replaceDeprecatedCodes(
+                       $this->mOptions['language']
+               );
+ 
                $this->mOptionsLoaded = true;
  
                Hooks::run( 'UserLoadOptions', [ $this, &$this->mOptions ] );