From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 12 Oct 2006 01:07:01 +0000 (+0000)
Subject: * (bug 6164) Avoid smashing Cite state if message transformation triggers
X-Git-Tag: 1.31.0-rc.0~55530
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=45432053e82145707870ed54405b93cef5832fde;p=lhc%2Fweb%2Fwiklou.git

* (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 a13bf96bdd..aa937918a1 100644
--- 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 d182d527ab..75755588ac 100644
--- 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 ) !== '*' ) {