Don't put literal <nowiki>, <hiero>, or <timeline> into the output. This

breaks (X)HTML validation as well as the general rule of rejecting
unknown tags by showing them as text. (<nowiki> is never unknown of course,
so it never appears. Just its text remains raw.)

diff --git a/includes/Parser.php b/includes/Parser.php
index 2bb28ed..944353f 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -214,18 +214,23 @@ class Parser
 
                $text = Parser::extractTags("nowiki", $text, $nowiki_content, $uniq_prefix);
                foreach( $nowiki_content as $marker => $content ){
-                       //if( $render ){
+                       if( $render ){
                                //# use span to mark nowiki areas, note the trailing whitespace in span to avoid collisions with other spans
                                //$nowiki_content[$marker] = '<span class="nowiki">'.wfEscapeHTMLTagsOnly( $content )."</span  >";
-                       //} else {
+                               $nowiki_content[$marker] = $content;
+                       } else {
                                $nowiki_content[$marker] = "<nowiki>$content</nowiki>";
-                       //}
+                       }
                }
 
                $text = Parser::extractTags("hiero", $text, $hiero_content, $uniq_prefix);
                foreach( $hiero_content as $marker => $content ){
-                       if( $render && $GLOBALS['wgUseWikiHiero']){
-                               $hiero_content[$marker] = WikiHiero( $content, WH_MODE_HTML);
+                       if( $render ) {
+                               if( $GLOBALS['wgUseWikiHiero'] ) {
+                                       $hiero_content[$marker] = WikiHiero( $content, WH_MODE_HTML);
+                               } else {
+                                       $hiero_content[$marker] = "&lt;hiero&gt;$content&lt;/hiero&gt;";
+                               }
                        } else {
                                $hiero_content[$marker] = "<hiero>$content</hiero>";
                        }
@@ -233,8 +238,12 @@ class Parser
                
                $text = Parser::extractTags("timeline", $text, $timeline_content, $uniq_prefix);
                foreach( $timeline_content as $marker => $content ){
-                       if( $render && $GLOBALS['wgUseTimeline']){
-                               $timeline_content[$marker] = renderTimeline( $content );
+                       if( $render ) {
+                               if( $render && $GLOBALS['wgUseTimeline']){
+                                       $timeline_content[$marker] = renderTimeline( $content );
+                               } else {
+                                       $timeline_content[$marker] = "&lt;timeline&gt;$content&lt;/timeline&gt;";
+                               }
                        } else {
                                $timeline_content[$marker] = "<timeline>$content</timeline>";
                        }
@@ -246,7 +255,7 @@ class Parser
                                if( $this->mOptions->getUseTeX() ) {
                                        $math_content[$marker] = renderMath( $content );
                                } else {
-                                       $math_content[$marker] = "&lt;math&gt;$content&lt;math&gt;";
+                                       $math_content[$marker] = "&lt;math&gt;$content&lt;/math&gt;";
                                }
                        } else {
                                $math_content[$marker] = "<math>$content</math>";
@@ -255,7 +264,7 @@ class Parser
 
                $text = Parser::extractTags("pre", $text, $pre_content, $uniq_prefix);
                foreach( $pre_content as $marker => $content ){
-                       if( $render ){
+                       if( $render ) {
                                $pre_content[$marker] = "<pre>" . wfEscapeHTMLTagsOnly( $content ) . "</pre>";
                        } else {
                                $pre_content[$marker] = "<pre>$content</pre>";