dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2df1502)
Convert literal tabs to 	 when passing them through Tidy, to prevent them from...
authorFran Rogers <krimpet@users.mediawiki.org>
Mon, 20 Oct 2008 06:46:09 +0000 (06:46 +0000)
committerFran Rogers <krimpet@users.mediawiki.org>
Mon, 20 Oct 2008 06:46:09 +0000 (06:46 +0000)
includes/parser/Parser.php patch | blob | history

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 0d3d517..561283a 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -665,9 +665,14 @@ class Parser
         */
        function tidy( $text ) {
                global $wgTidyInternal;
+
                $wrappedtext = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'.
 ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>'.
 '<head><title>test</title></head><body>'.$text.'</body></html>';
+
+               # Tidy is known to clobber tabs; convert 'em to entities
+               $wrappedtext = str_replace("\t", '&#9;', $wrappedtext);
+
                if( $wgTidyInternal ) {
                        $correctedtext = self::internalTidy( $wrappedtext );
                } else {
@@ -677,6 +682,10 @@ class Parser
                        wfDebug( "Tidy error detected!\n" );
                        return $text . "\n<!-- Tidy found serious XHTML errors -->\n";
                }
+
+               # Convert the tabs back from entities
+               $correctedtext = str_replace('&#9;', "\t", $correctedtext);
+
                return $correctedtext;
        }
 
Wiklou, le Wiki du Wiklou