[MediaWiki-CVS] SVN: [97639] trunk/extensions/wikihiero

[maxsem]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97639

Revision: 97639
Author:   maxsem
Date:     2011-09-20 16:03:06 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Fixed HTML comments handling from r97542

Modified Paths:
--------------
    trunk/extensions/wikihiero/tests.txt
    trunk/extensions/wikihiero/wikihiero.body.php

Modified: trunk/extensions/wikihiero/tests.txt
===================================================================
--- trunk/extensions/wikihiero/tests.txt        2011-09-20 15:59:28 UTC (rev 
97638)
+++ trunk/extensions/wikihiero/tests.txt        2011-09-20 16:03:06 UTC (rev 
97639)
@@ -81,3 +81,13 @@
 <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>
 
 !! end
+
+!! test
+WikiHiero - HTML comments
+!! input
+<hiero>A1<!-- B1 --> C1 D<!--
+fooooo -->1</hiero>
+!! result
+<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>
+
+!! end

Modified: trunk/extensions/wikihiero/wikihiero.body.php
===================================================================
--- trunk/extensions/wikihiero/wikihiero.body.php       2011-09-20 15:59:28 UTC 
(rev 97638)
+++ trunk/extensions/wikihiero/wikihiero.body.php       2011-09-20 16:03:06 UTC 
(rev 97639)
@@ -410,10 +410,10 @@
                $this->currentBlock = array();
                $this->token = '';
                
-               $text = preg_replace( '/<!--.*?-->/', '', $this->text ); // 
remove HTML comments
+               $text = preg_replace( '/\\<!--.*?--\\>/s', '', $this->text ); 
// remove HTML comments
 
                for ( $i = 0; $i < strlen( $text ); $i++ ) {
-                       $char = $this->text[$i];
+                       $char = $text[$i];
 
                        if ( isset( self::$delimiters[$char] ) ) {
                                $this->newBlock();


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs