From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Fri, 27 May 2011 20:55:02 +0000 (+0000)
Subject: fix for Bug #93 “tilde signatures inside nowiki tags sometimes get expanded (<include... 
X-Git-Tag: 1.31.0-rc.0~29908
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=bb8fbba7b3971b9f720dc5b39887cc5bb12130b5;p=lhc%2Fweb%2Fwiklou.git

fix for Bug #93 “tilde signatures inside nowiki tags sometimes get expanded (<includeonly><nowiki>~~~~</nowiki></includeonly>)”
Patch from Brad Jorsch

Fix for includeonly case.  Hopefully fixing this ancient bug doesn't
‘cause people to cry
---

diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 2dd3efd27c..b08ed09cbf 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -185,6 +185,9 @@ class Preprocessor_DOM implements Preprocessor {
 			if ( strpos( $text, '<onlyinclude>' ) !== false && strpos( $text, '</onlyinclude>' ) !== false ) {
 				$enableOnlyinclude = true;
 			}
+		} else if ( $this->parser->ot['wiki'] ) {
+			$ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude', 'includeonly', '/includeonly' );
+			$ignoredElements = array();
 		} else {
 			$ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' );
 			$ignoredElements = array( 'includeonly' );
diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index b84b39deb7..7f175e58ad 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -144,6 +144,9 @@ class Preprocessor_Hash implements Preprocessor {
 			if ( strpos( $text, '<onlyinclude>' ) !== false && strpos( $text, '</onlyinclude>' ) !== false ) {
 				$enableOnlyinclude = true;
 			}
+		} else if ( $this->parser->ot['wiki'] ) {
+			$ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude', 'includeonly', '/includeonly' );
+			$ignoredElements = array();
 		} else {
 			$ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' );
 			$ignoredElements = array( 'includeonly' );