r87214 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87213‎ | r87214 | r87215 >
Date:20:35, 1 May 2011
Author:platonides
Status:deferred
Tags:
Comment:
Follow up r87211, update the unserializeNode() and fix flag resetting which we were missing (not hit before r86072).
Modified paths:
  • /trunk/extensions/NativePreprocessor/Preprocessor_Native.php (modified) (history)
  • /trunk/extensions/NativePreprocessor/preprocesstoobj.c (modified) (history)

Diff [purge]

Index: trunk/extensions/NativePreprocessor/Preprocessor_Native.php
@@ -89,7 +89,8 @@
9090 $lineStart = $flags ? " lineStart=\"1\"" : "";
9191 return "<template$lineStart>$result</template>";
9292 case 'p':
93 - return "<tplarg>$result</tplarg>";
 93+ $lineStart = $flags ? " lineStart=\"1\"" : "";
 94+ return "<tplarg$lineStart>$result</tplarg>";
9495 case 'T':
9596 return "<title>$result</title>";
9697 case '|':
Index: trunk/extensions/NativePreprocessor/preprocesstoobj.c
@@ -724,6 +724,7 @@
725725 } else {
726726 /* Prepend a literal node with the skipped braces */
727727 int skippedBraces = 1 /* = parentNode->count */;
 728+ parentNode->flags = 0; /* We are prepending literals, so this can no longer be a lineStart */
728729 closeNode( parentNode->type );
729730
730731 struct node tmpnode;

Follow-up revisions

RevisionCommit summaryAuthorDate
r101283Revert r87211 as r86072 which it was mimicking was also reverted in r96887....platonides21:13, 29 October 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r86072Followup to r86064 (List with double line-breaks inside tables). Also contain...diebuche19:28, 14 April 2011
r87211Update to incorporate the Preprocessor change of r86072 of what is a lineStartplatonides19:39, 1 May 2011

Status & tagging log