* (bug 6164) Avoid smashing Cite state if message transformation triggers

  during bad image list check, by skipping message transformation.
  This isn't a good permanent fix.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a13bf96..aa93791 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -36,7 +36,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Disable PHP exception backtrace printing unless $wgShowExceptionDetails
   is set. Backtraces may contain sensitive information in function call
   parameters.
-
+* (bug 6164) Avoid smashing Cite state if message transformation triggers
+  during bad image list check, by skipping message transformation.
+  This isn't a good permanent fix.
+  
 
 == Languages updated ==
 

diff --git a/includes/ImageFunctions.php b/includes/ImageFunctions.php
index d182d52..7575558 100644 (file)
--- a/includes/ImageFunctions.php
+++ b/includes/ImageFunctions.php
@@ -198,7 +198,7 @@ function wfIsBadImage( $name, $contextTitle = false ) {
        if( !$badImages ) {
                # Build the list now
                $badImages = array();
-               $lines = explode( "\n", wfMsgForContent( 'bad_image_list' ) );
+               $lines = explode( "\n", wfMsgForContentNoTrans( 'bad_image_list' ) );
                foreach( $lines as $line ) {
                        # List items only
                        if ( substr( $line, 0, 1 ) !== '*' ) {