Merge "Language: compare on same object in equals()"

diff --combined languages/Language.php
index 3253957,f3751fd..deee2bc
--- 1/languages/Language.php
--- 2/languages/Language.php
+++ b/languages/Language.php
@@@ -220,8 -220,7 +220,8 @@@ class Language 
  
                // Check if there is a language class for the code
                $class = self::classFromCode( $code, $fallback );
 -              if ( class_exists( $class ) ) {
 +              // LanguageCode does not inherit Language
 +              if ( class_exists( $class ) && is_a( $class, 'Language', true ) ) {
                        $lang = new $class;
                        return $lang;
                }
@@@ -1090,7 -1089,7 +1090,7 @@@
         * @param string $ts 14-character timestamp
         *      YYYYMMDDHHMMSS
         *      01234567890123
 -       * @param DateTimeZone $zone Timezone of $ts
 +       * @param DateTimeZone|null $zone Timezone of $ts
         * @param int &$ttl The amount of time (in seconds) the output may be cached for.
         * Only makes sense if $ts is the current time.
         * @todo handling of "o" format character for Iranian, Hebrew, Hijri & Thai?
@@@ -4076,7 -4075,7 +4076,7 @@@
         * match up with it.
         *
         * @param string $str The validated block duration in English
 -       * @param User $user User object to use timezone from or null for $wgUser
 +       * @param User|null $user User object to use timezone from or null for $wgUser
         * @param int $now Current timestamp, for formatting relative block durations
         * @return string Somehow translated block duration
         * @see LanguageFi.php for example implementation
@@@ -4400,7 -4399,7 +4400,7 @@@
         * @return bool
         */
        public function equals( Language $lang ) {
-               return $lang->getCode() === $this->mCode;
+               return $lang === $this || $lang->getCode() === $this->mCode;
        }
  
        /**