Apply a live hack from Wikimedia codebase: throw exception on invalid input to Messag...

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index fecaa53..4776e85 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -619,6 +619,9 @@ class MessageCache {
         */
        function addMessages( $messages, $lang = 'en' ) {
                wfProfileIn( __METHOD__ );
+               if ( !is_array( $messages ) ) {
+                       throw new MWException( __METHOD__.': Invalid message array' );
+               }
                if ( isset( $this->mExtensionMessages[$lang] ) ) {
                        $this->mExtensionMessages[$lang] = $messages + $this->mExtensionMessages[$lang];
                } else {