From 0d89dad0181ca9212059cc0c14d6d3687e1bfb7e Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 27 Apr 2006 21:17:39 +0000
Subject: [PATCH] Fix #5005: XHTML <gallery> output. Patch by: Jitse Niesen
 <j.niesen@latrobe.edu.au>

---
 RELEASE-NOTES             | 1 +
 includes/ImageGallery.php | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9699b278fd..94c09a8477 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -129,6 +129,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Updated maintenance/transstat.php so it can show duplicate messages
 * Improvements to update scripts; print out the version, check for superuser credentials
   before attempting a connection, and produce a friendlier error if the connection fails
+* (bug 5005): Fix XHTML <gallery> output.
 
 == Compatibility ==
 
diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 7ae916b565..561cfb15c3 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -100,8 +100,11 @@ class ImageGallery
 
 			// Not an image. Just print the name and skip.
 			if ( $nt->getNamespace() != NS_IMAGE ) {
-				$s .= '<td><div class="gallerybox" style="height: 152px;">' .
-					htmlspecialchars( $nt->getText() ) . '</div></td>' .  (($i%4==3) ? "</tr>\n" : '');
+				$s .=
+					(($i%4==0) ? "<tr>\n" : '') .
+					'<td><div class="gallerybox" style="height: 152px;">' .
+					htmlspecialchars( $nt->getText() ) . '</div></td>' .  
+					(($i%4==3) ? "</tr>\n" : '');
 				$i++;
 
 				continue;
-- 
2.20.1