* (bug 10166) Fix a PHP warning in Language::getMagic

Patch by Nate Lallouche

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f29aaed..f07a5cf 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -225,6 +225,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   to 'stderr' at runtime.
 * (bug 12148) Text highlight wasn't applied to cleanly deleted and added
   lines in diff output
+* (bug 10166) Fix a PHP warning in Language::getMagic
 
 == Parser changes in 1.12 ==
 

diff --git a/languages/Language.php b/languages/Language.php
index 9cbe943..5d862b4 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1532,9 +1532,10 @@ class Language {
 
                if( !is_array( $rawEntry ) ) {
                        error_log( "\"$rawEntry\" is not a valid magic thingie for \"$mw->mId\"" );
+               } else {
+                       $mw->mCaseSensitive = $rawEntry[0];
+                       $mw->mSynonyms = array_slice( $rawEntry, 1 );
                }
-               $mw->mCaseSensitive = $rawEntry[0];
-               $mw->mSynonyms = array_slice( $rawEntry, 1 );
        }
 
        /**