From 7604067090aaa2490d0b57c66861373d5c6d7e70 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 1 Dec 2004 16:45:26 +0000
Subject: [PATCH] XHTML fixes

---
 includes/ImageGallery.php     | 9 ++++++---
 includes/SpecialNewimages.php | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 7a8c6e01aa..8184ce4987 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -97,20 +97,23 @@ class ImageGallery
 				wfMsg( "nbytes", $wgLang->formatNum( $img->getSize() ) )  . '<br />' :
 				'' ;
 			$textlink = $this->mShowFilename ?
-				$sk->makeKnownLinkObj( $nt, Language::truncate( $nt->getText(), 20, '...' ) ) . '<br />' :
+				$sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20, '...' ) ) ) . '<br />' :
 				'' ;
 
 			$s .= ($i%4==0) ? '<tr>' : '';
 			$s .= '<td valign="top" width="150px" style="background-color:#F0F0F0;">' .
 				'<table width="100%" height="150px">'.
 				'<tr><td align="center" valign="center" style="background-color:#F8F8F8;border:solid 1px #888888;">' .
-				$sk->makeKnownLinkObj( $nt, '<img  src="'.$img->createThumb(120,120).'" alt="">' ) . '</td></tr></table> ' .
+				$sk->makeKnownLinkObj( $nt, '<img  src="'.$img->createThumb(120,120).'" alt="" />' ) . '</td></tr></table> ' .
 				$textlink . $text . $nb; 
 
-			$s .= '</td>' .  (($i%4==3) ? '</tr>' : '');
+			$s .= "</td>\n" .  (($i%4==3) ? "</tr>\n" : '');
 
 			$i++;
 		}
+		if( $i %4 != 0 ) {
+			$s .= "</tr>\n";
+		}
 		$s .= '</table>';
 
 		return $s;
diff --git a/includes/SpecialNewimages.php b/includes/SpecialNewimages.php
index c42f4deb10..9d0d51b461 100644
--- a/includes/SpecialNewimages.php
+++ b/includes/SpecialNewimages.php
@@ -72,7 +72,7 @@ function wfSpecialNewimages() {
 		  "sort=bydate&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
 	}
 	$text = wfMsg( 'showlast', $fill, $bydate );
-	$wgOut->addHTML( $text."</p>\n" );
+	$wgOut->addHTML( $text."\n" );
 
 	$i=0;
 	$res = $dbr->query( $sql, 'wfSpecialImagelist' );
-- 
2.20.1