From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 24 Jun 2011 20:25:16 +0000 (+0000)
Subject: * Removed break in first loop of generateTableHTML(), which caused:
X-Git-Tag: 1.31.0-rc.0~29304
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=335b921b2bdd4f4cc13a32deb8fe7164b0a9a909;p=lhc%2Fweb%2Fwiklou.git

* Removed break in first loop of generateTableHTML(), which caused:
'<b>Notice</b>: Undefined index: type in <b>C:\wamp\www\MW_trunk\includes\parser\Parser.php</b>
* Made some code simplifications
---

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 527da1d215..8d86436102 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1019,7 +1019,7 @@ class Parser {
 	 *
 	 * @private
 	 */
-	function generateTableHTML ( &$table ) {
+	function generateTableHTML( &$table ) {
 		$return = "";
 		$return .= str_repeat( '<dl><dd>' , $table['indent'] );
 		$return .= '<table';
@@ -1041,22 +1041,20 @@ class Parser {
 		// If we only have tbodies, mark table as simple
 		for ( $i = 0; isset( $table[$i] ); $i++ ) {
 			if ( !count( $table[$i] ) ) continue;
-			if ( !isset( $table[$i]['type'] ) ) $table[$i]['type'] = 'tbody';
+			if ( !isset( $table[$i]['type'] ) ) {
+				$table[$i]['type'] = 'tbody';
+			}
 			if ( !$lastSection ) {
 				$lastSection = $table[$i]['type'];
 			} elseif ( $lastSection != $table[$i]['type'] ) {
 				$simple = false;
-				break;
 			}
 		}
 		$lastSection = '';
 		for ( $i = 0; isset( $table[$i] ); $i++ ) {
-			// Check for empty tables
-			if ( count( $table[$i] ) ) {
-				$empty = false;
-			} else {
-				continue;
-			}
+			if ( !count( $table[$i] ) ) continue;
+			$empty = false; // check for empty tables
+
 			if ( $table[$i]['type'] != $lastSection && !$simple ) {
 				$return .= "\n<" . $table[$i]['type'] . '>';
 			}