From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Wed, 2 Jun 2004 00:39:02 +0000 (+0000)
Subject: bug fix: list item with nowiki
X-Git-Tag: 1.5.0alpha1~3084
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=10fa17d61b68a6017285d9f0cae7386fd14d1271;p=lhc%2Fweb%2Fwiklou.git

bug fix: list item with nowiki
---

diff --git a/includes/Parser.php b/includes/Parser.php
index 1b1a4b2588..016b0d8a7b 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\"/", $oLine, $nowikiOpenMatches );
 			$nowikiCloseMatch = preg_match("/<\\/span  >/", $oLine );
 			if (!$this->mInPre) {
 				$this->mInPre = !empty($preOpenMatch);
@@ -1032,7 +1032,11 @@ class Parser
 			if (!$this->mInNowiki) {
 				$this->mInNowiki = !empty($nowikiOpenMatch);
 			}
-			if ( !$this->mInPre && !$this->mInNowiki ) {
+			if ( 
+				!$this->mInPre && (!$this->mInNowiki || 
+				$nowikiOpenMatch && !empty($nowikiOpenMatches[2]) && strlen($nowikiOpenMatches[2]) > 0 ) 
+			) 
+			{
 				# Multiple prefixes may abut each other for nested lists.
 				$prefixLength = strspn( $oLine, "*#:;" );
 				$pref = substr( $oLine, 0, $prefixLength );