r102548 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r102547‎ | r102548 | r102549 >
Date:17:53, 9 November 2011
Author:platonides
Status:ok
Tags:
Comment:
MFT r101291 and r102454
r102440 had already been merged in r102539
Modified paths:
  • /branches/REL1_18/phase3/includes/parser/CoreParserFunctions.php (modified) (history)
  • /branches/REL1_18/phase3/tests/parser/parserTests.txt (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/includes/parser/CoreParserFunctions.php
@@ -98,8 +98,7 @@
9999 if ( strval( $part1 ) !== '' ) {
100100 $args = array_slice( func_get_args(), 2 );
101101 $message = wfMessage( $part1, $args )->inLanguage( $parser->getOptions()->getUserLang() )->plain();
102 - $message = $parser->replaceVariables( $message ); // like MessageCache::transform()
103 - return $message;
 102+ return array( $message, 'noparse' => false );
104103 } else {
105104 return array( 'found' => false );
106105 }
Index: branches/REL1_18/phase3/tests/parser/parserTests.txt
@@ -8734,12 +8734,12 @@
87358735
87368736 !! test
87378737 Bug 31098 Template which includes system messages which includes the template
8738 -!! options
8739 -disabled
87408738 !! input
87418739 {{Identical}}
87428740 !! result
8743 -...
 8741+<p><span class="error">Template loop detected: <a href="https://www.mediawiki.org/wiki/Template:Identical" title="Template:Identical">Template:Identical</a></span>
 8742+<span class="error">Template loop detected: <a href="https://www.mediawiki.org/wiki/Template:Identical" title="Template:Identical">Template:Identical</a></span>
 8743+</p>
87448744 !! end
87458745
87468746 !! test
@@ -8798,6 +8798,23 @@
87998799 !! end
88008800
88018801
 8802+!! article
 8803+MediaWiki:Bug32057
 8804+!! text
 8805+== {{int:headline_sample}} ==
 8806+!! endarticle
 8807+
 8808+!! test
 8809+Bug 32057: Title needed when expanding <h> nodes.
 8810+!! options
 8811+title=[[Main Page]]
 8812+!! input
 8813+{{int:Bug32057}}
 8814+!! result
 8815+<h2><span class="editsection">[<a href="https://www.mediawiki.org/index.php?title=Main_Page&amp;action=edit&amp;section=1" title="Edit section: Headline text">edit</a>]</span> <span class="mw-headline" id="Headline_text"> Headline text </span></h2>
 8816+
 8817+!! end
 8818+
88028819 TODO:
88038820 more images
88048821 more tables

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r101291Bug 31098: Template loop through MediaWiki: messages (int: function) not bein...platonides22:22, 29 October 2011
r102440Attempt to fix translatewiki bug 32057...platonides20:58, 8 November 2011
r102454Test for bug 32057....platonides21:55, 8 November 2011
r102539REL1_18 MFT r102027, r102414, r102440, r102488reedy17:26, 9 November 2011

Status & tagging log