Merge "(bug 36908) Language::isValidBuiltInCode passed an object"

diff --combined languages/Language.php
index b36732b,877ccfe..240b0d3
--- 1/languages/Language.php
--- 2/languages/Language.php
+++ b/languages/Language.php
@@@ -245,6 -245,15 +245,15 @@@ class Language 
         * @return bool
         */
        public static function isValidBuiltInCode( $code ) {
+ 
+               if( !is_string($code) ) {
+                       $type = gettype( $code );
+                       if( $type === 'object' ) {
+                               $addmsg = " of class " . get_class( $code );
+                       }
+                       throw new MWException( __METHOD__ . " must be passed a string, $type given$addmsg" );
+               }
+ 
                return preg_match( '/^[a-z0-9-]+$/i', $code );
        }
  
@@@ -700,9 -709,9 +709,9 @@@
         *              Use null for autonyms (native names)
         * @param $include string:
         *              'all' all available languages
 -       *              'mw' only if the language is defined in MediaWiki or wgExtraLanguageNames
 +       *              'mw' only if the language is defined in MediaWiki or wgExtraLanguageNames (default)
         *              'mwfile' only if the language is in 'mw' *and* has a message file
 -       * @return array|bool: language code => language name, false if $include is wrong
 +       * @return array: language code => language name
         * @since 1.20
         */
        public static function fetchLanguageNames( $inLanguage = null, $include = 'mw' ) {
@@@ -740,7 -749,9 +749,7 @@@
                        $returnMw[$coreCode] = $names[$coreCode];
                }
  
 -              if( $include === 'mw' ) {
 -                      return $returnMw;
 -              } elseif( $include === 'mwfile' ) {
 +              if( $include === 'mwfile' ) {
                        $namesMwFile = array();
                        # We do this using a foreach over the codes instead of a directory
                        # loop so that messages files in extensions will work correctly.
@@@ -751,8 -762,7 +760,8 @@@
                        }
                        return $namesMwFile;
                }
 -              return false;
 +              # 'mw' option; default if it's not one of the other two options (all/mwfile)
 +              return $returnMw;
        }
  
        /**