r97639 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97638‎ | r97639 | r97640 >
Date:16:03, 20 September 2011
Author:maxsem
Status:ok
Tags:
Comment:
Fixed HTML comments handling from r97542
Modified paths:
  • /trunk/extensions/wikihiero/tests.txt (modified) (history)
  • /trunk/extensions/wikihiero/wikihiero.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/wikihiero/tests.txt
@@ -81,3 +81,13 @@
8282 <table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_A1.png' title='A1' alt='A1' /></td><td><table class="mw-hiero-table" style="width: 44px;"><tr><td>&#160;</td></tr></table></td><td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_B1.png' title='B1' alt='B1' /></td><td><table class="mw-hiero-table" style="width: 22px;"><tr><td>&#160;</td></tr></table></td><td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_C1.png' title='C1' alt='C1' /></td></tr></table> </td></tr></table>
8383
8484 !! end
 85+
 86+!! test
 87+WikiHiero - HTML comments
 88+!! input
 89+<hiero>A1<!-- B1 --> C1 D<!--
 90+fooooo -->1</hiero>
 91+!! result
 92+<table class='mw-hiero-table mw-hiero-outer' dir='ltr'><tr><td> <table class="mw-hiero-table"><tr> <td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_A1.png' title='A1' alt='A1' /></td><td><img style='margin:1px;' height='38' src='/extensions/wikihiero/img/hiero_C1.png' title='C1' alt='C1' /></td><td><img style='margin:1px;' height='19' src='/extensions/wikihiero/img/hiero_D1.png' title='D1' alt='D1' /></td></tr></table> </td></tr></table>
 93+
 94+!! end
Index: trunk/extensions/wikihiero/wikihiero.body.php
@@ -410,10 +410,10 @@
411411 $this->currentBlock = array();
412412 $this->token = '';
413413
414 - $text = preg_replace( '/<!--.*?-->/', '', $this->text ); // remove HTML comments
 414+ $text = preg_replace( '/\\<!--.*?--\\>/s', '', $this->text ); // remove HTML comments
415415
416416 for ( $i = 0; $i < strlen( $text ); $i++ ) {
417 - $char = $this->text[$i];
 417+ $char = $text[$i];
418418
419419 if ( isset( self::$delimiters[$char] ) ) {
420420 $this->newBlock();

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r97542Rewrote tokenizer so that it can actually be understood by mortal humans. All...maxsem19:33, 19 September 2011

Status & tagging log