| Index: trunk/phase3/includes/ImageFunctions.php |
| — | — | @@ -198,7 +198,7 @@ |
| 199 | 199 | if( !$badImages ) { |
| 200 | 200 | # Build the list now |
| 201 | 201 | $badImages = array(); |
| 202 | | - $lines = explode( "\n", wfMsgForContent( 'bad_image_list' ) ); |
| | 202 | + $lines = explode( "\n", wfMsgForContentNoTrans( 'bad_image_list' ) ); |
| 203 | 203 | foreach( $lines as $line ) { |
| 204 | 204 | # List items only |
| 205 | 205 | if ( substr( $line, 0, 1 ) !== '*' ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -36,8 +36,11 @@ |
| 37 | 37 | * Disable PHP exception backtrace printing unless $wgShowExceptionDetails |
| 38 | 38 | is set. Backtraces may contain sensitive information in function call |
| 39 | 39 | parameters. |
| | 40 | +* (bug 6164) Avoid smashing Cite state if message transformation triggers |
| | 41 | + during bad image list check, by skipping message transformation. |
| | 42 | + This isn't a good permanent fix. |
| | 43 | + |
| 40 | 44 | |
| 41 | | - |
| 42 | 45 | == Languages updated == |
| 43 | 46 | |
| 44 | 47 | * Occitan (oc) |