From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Sat, 22 May 2004 18:22:05 +0000 (+0000)
Subject: allow paragraphing inside div's
X-Git-Tag: 1.5.0alpha1~3229
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=4bcf953707b7bcbb52784f6203aff4c158b4f312;p=lhc%2Fweb%2Fwiklou.git

allow paragraphing inside div's
---

diff --git a/includes/Parser.php b/includes/Parser.php
index c345e28eec..a25b447394 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1236,10 +1236,10 @@ class Parser
 				# No prefix (not in list)--go to paragraph mode
 				$uniq_prefix = UNIQ_PREFIX;
 				// XXX: use a stack for nestable elements like span, table and div
-				$openmatch = preg_match("/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<div|<pre|<tr|<td|<p|<ul|<li)/i", $t );
+				$openmatch = preg_match("/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<td|<p|<ul|<li)/i", $t );
 				$closematch = preg_match(
 					"/(<\\/table|<\\/blockquote|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|".
-					"<\\/div|<hr|<\\/td|<\\/pre|<\\/p|".$uniq_prefix."-pre|<\\/li|<\\/ul)/i", $t );
+					"<div|<\\/div|<hr|<\\/td|<\\/pre|<\\/p|".$uniq_prefix."-pre|<\\/li|<\\/ul)/i", $t );
 				if ( $openmatch or $closematch ) {
 					$paragraphStack = false;
 					$output .= $this->closeParagraph();