Merge "Language: s/error_log/wfWarn/"

diff --combined languages/Language.php
index 2bc4554,dbafc3c..9bbccf1
--- 1/languages/Language.php
--- 2/languages/Language.php
+++ b/languages/Language.php
@@@ -3142,7 -3142,7 +3142,7 @@@ class Language 
                }
  
                if ( !is_array( $rawEntry ) ) {
-                       error_log( "\"$rawEntry\" is not a valid magic word for \"$mw->mId\"" );
+                       wfWarn( "\"$rawEntry\" is not a valid magic word for \"$mw->mId\"" );
                } else {
                        $mw->mCaseSensitive = $rawEntry[0];
                        $mw->mSynonyms = array_slice( $rawEntry, 1 );
@@@ -3997,7 -3997,7 +3997,7 @@@
         * Get the list of variants supported by this language
         * see sample implementation in LanguageZh.php
         *
 -       * @return array an array of language codes
 +       * @return array An array of language codes
         */
        public function getVariants() {
                return $this->mConverter->getVariants();
@@@ -4289,7 -4289,7 +4289,7 @@@
         *
         * @since 1.22
         * @param string $code Language code
 -       * @return array array( fallbacks, site fallbacks )
 +       * @return array Array( fallbacks, site fallbacks )
         */
        public static function getFallbacksIncludingSiteLanguage( $code ) {
                global $wgLanguageCode;
@@@ -4344,7 -4344,7 +4344,7 @@@
         *
         * @since 1.19
         * @param string $code Language code
 -       * @return array of message keys (strings)
 +       * @return array Array of message keys (strings)
         */
        public static function getMessageKeysFor( $code ) {
                return self::getLocalisationCache()->getSubItemList( $code, 'messages' );