| Index: trunk/phase3/tests/parser/parserTests.txt |
| — | — | @@ -8795,12 +8795,12 @@ |
| 8796 | 8796 | |
| 8797 | 8797 | !! test |
| 8798 | 8798 | Bug 31098 Template which includes system messages which includes the template |
| 8799 | | -!! options |
| 8800 | | -disabled |
| 8801 | 8799 | !! input |
| 8802 | 8800 | {{Identical}} |
| 8803 | 8801 | !! result |
| 8804 | | -... |
| | 8802 | +<p><span class="error">Template loop detected: <a href="https://www.mediawiki.org/wiki/Template:Identical" title="Template:Identical">Template:Identical</a></span> |
| | 8803 | +<span class="error">Template loop detected: <a href="https://www.mediawiki.org/wiki/Template:Identical" title="Template:Identical">Template:Identical</a></span> |
| | 8804 | +</p> |
| 8805 | 8805 | !! end |
| 8806 | 8806 | |
| 8807 | 8807 | !! test |
| Index: trunk/phase3/includes/parser/CoreParserFunctions.php |
| — | — | @@ -98,8 +98,7 @@ |
| 99 | 99 | if ( strval( $part1 ) !== '' ) { |
| 100 | 100 | $args = array_slice( func_get_args(), 2 ); |
| 101 | 101 | $message = wfMessage( $part1, $args )->inLanguage( $parser->getOptions()->getUserLangObj() )->plain(); |
| 102 | | - $message = $parser->replaceVariables( $message ); // like MessageCache::transform() |
| 103 | | - return $message; |
| | 102 | + return array( $message, 'noparse' => false ); |
| 104 | 103 | } else { |
| 105 | 104 | return array( 'found' => false ); |
| 106 | 105 | } |