From 29ba626ddb1780e0e006a146e5e455ac2da7376d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 3 Feb 2005 08:44:59 +0000
Subject: [PATCH] * (bug 1457) Fix XHTML validation on category column list

---
 includes/CategoryPage.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 6160b4d46b..911f017028 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -233,8 +233,8 @@ class CategoryPage extends Article {
 			$chunkIndex < 3;
 			$chunkIndex++, $startChunk = $endChunk, $endChunk += $chunk + 1)
 		{
-
-			$r .= '<td><ul>';
+			$r .= "<td>\n";
+			$atColumnTop = true;
 
 			// output all articles in category
 			for ($index = $startChunk ;
@@ -246,16 +246,24 @@ class CategoryPage extends Article {
 					 ($articles_start_char[$index] != $articles_start_char[$index - 1]) )
 
 				{
+					if( $atColumnTop ) {
+						$atColumnTop = false;
+					} else {
+						$r .= "</ul>\n";
+					}
 					$cont_msg = "";
 					if ( $articles_start_char[$index] == $prev_start_char )
 						$cont_msg = wfMsg('listingcontinuesabbrev');
-					$r .= "</ul><h3>{$articles_start_char[$index]}$cont_msg</h3>\n<ul>";
+					$r .= "<h3>{$articles_start_char[$index]}$cont_msg</h3>\n<ul>";
 					$prev_start_char = $articles_start_char[$index];
 				}
 
 				$r .= "<li>{$articles[$index]}</li>";
 			}
-			$r .= '</ul></td>';
+			if( !$atColumnTop ) {
+				$r .= "</ul>\n";
+			}
+			$r .= "</td>\n";
 
 
 		}
-- 
2.20.1