From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Tue, 1 Jun 2004 07:25:48 +0000 (+0000)
Subject: table handling fix and notice silencing instead of buggy checking in the html strip... 
X-Git-Tag: 1.5.0alpha1~3103
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=6b87eb00771b6954b6a15771f1e8834ec72bc8e2;p=lhc%2Fweb%2Fwiklou.git

table handling fix and notice silencing instead of buggy checking in the html strip function
---

diff --git a/includes/Parser.php b/includes/Parser.php
index 0368d25c81..f3b0fc66fa 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1089,10 +1089,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|<pre|<tr|<td|<p|<ul|<li)/i", $t );
+				$openmatch = preg_match("/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<li|<\\/td)/i", $t );
 				$closematch = preg_match(
 					"/(<\\/table|<\\/blockquote|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|".
-					"<div|<\\/div|<hr|<\\/td|<\\/pre|<\\/p|".$uniq_prefix."-pre|<\\/li|<\\/ul)/i", $t );
+					"<td|<div|<\\/div|<hr|<\\/pre|<\\/p|".$uniq_prefix."-pre|<\\/li|<\\/ul)/i", $t );
 				if ( $openmatch or $closematch ) {
 					$paragraphStack = false;
 					$output .= $this->closeParagraph();
@@ -1536,8 +1536,8 @@ class Parser
 					if ( $slash ) {
 						# Closing a tag...
 						if ( ! in_array( $t, $htmlsingle ) &&
-						( count($tagstack) && $ot = array_pop( $tagstack ) ) != $t ) {
-							if(!empty($ot)) array_push( $tagstack, $ot );
+						( $ot = @array_pop( $tagstack ) ) != $t ) {
+							@array_push( $tagstack, $ot );
 							$badtag = 1;
 						} else {
 							if ( $t == "table" ) {