From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Wed, 2 Jun 2004 01:22:29 +0000 (+0000)
Subject: sig fix II
X-Git-Tag: 1.5.0alpha1~3083
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=9feaa3422a0a588aa319ce1ae3b1ee57eb1cbc02;p=lhc%2Fweb%2Fwiklou.git

sig fix II
---

diff --git a/includes/Parser.php b/includes/Parser.php
index 016b0d8a7b..b59bb61707 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1024,7 +1024,7 @@ class Parser
 			$lastPrefixLength = strlen( $lastPrefix );
 			$preOpenMatch = preg_match("/<pre/i", $oLine );
 			$preCloseMatch = preg_match("/<\\/pre/i", $oLine );
-			$nowikiOpenMatch = preg_match("/( *)(.*?)<span class=\"nowiki\"/", $oLine, $nowikiOpenMatches );
+			$nowikiOpenMatch = preg_match("/(.*|)<span class=\"nowiki\"/s", $oLine, $nowikiOpenMatches );
 			$nowikiCloseMatch = preg_match("/<\\/span  >/", $oLine );
 			if (!$this->mInPre) {
 				$this->mInPre = !empty($preOpenMatch);
@@ -1034,7 +1034,7 @@ class Parser
 			}
 			if ( 
 				!$this->mInPre && (!$this->mInNowiki || 
-				$nowikiOpenMatch && !empty($nowikiOpenMatches[2]) && strlen($nowikiOpenMatches[2]) > 0 ) 
+				($nowikiOpenMatch && strlen($nowikiOpenMatches[1]) > 0) ) 
 			) 
 			{
 				# Multiple prefixes may abut each other for nested lists.
@@ -1155,8 +1155,8 @@ class Parser
 						}
 					}
 				}
-				if($nowikiCloseMatch) $this->mInNowiki = false;
 			}
+			if($nowikiCloseMatch) $this->mInNowiki = false;
 			if ($paragraphStack === false) {
 				$output .= $t."\n";
 			}