Fix #5005: XHTML <gallery> output.

Patch by: Jitse Niesen <j.niesen@latrobe.edu.au>

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9699b27..94c09a8 100644 (file)
--- 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 7ae916b..561cfb1 100644 (file)
--- 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;