From f2b9274bce47afabb468d24e021820f318fbde68 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 12 Aug 2005 04:44:43 +0000
Subject: [PATCH] * (bug 3117) Fix display of upload size and type with tidy
 on. Wikitext blocks should never be inserted in the middle of a line, they
 are expected to be block elements!

---
 RELEASE-NOTES          |  1 +
 includes/ImagePage.php | 45 +++++++++++++++++++-----------------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 321e2fe9b6..3b4169faa5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,7 @@ Misc work going on.....
 * (bug 3056) MySQL 3 compatibility fix: USE INDEX instead of FORCE INDEX
 * PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
   if running prior to 4.2.0 as it causes the call to fail
+* (bug 3117) Fix display of upload size and type with tidy on
 
 
 === Caveats ===
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index f3ead557c1..f7aec17176 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -206,34 +206,29 @@ class ImagePage extends Article {
 
 
 			if ($showLink) {
-				$s= $sk->makeMediaLink( $this->img->getName(), '', '', true );
-				$info= wfMsg( 'fileinfo', ceil($this->img->getSize()/1024.0), $this->img->getMimeType() );
+				$filename = wfEscapeWikiText( $this->img->getName() );
+				$info = wfMsg( 'fileinfo',
+					ceil($this->img->getSize()/1024.0),
+					$this->img->getMimeType() );
 
 				if (!$this->img->isSafeFile()) {
-					$wgOut->addHTML("<div class=\"fullMedia\">");
-					$wgOut->addHTML("<span class=\"dangerousLink\">");
-					$wgOut->addHTML($s);
-					$wgOut->addHTML("</span>");
-
-					$wgOut->addHTML("<span class=\"fileInfo\"> (");
-					$wgOut->addWikiText( $info, false );
-					$wgOut->addHTML(")</span>");
-					$wgOut->addHTML("</div>");
-
-					#this should be formated a little nicer. Is CSS sufficient?
-					$wgOut->addHTML("<div class=\"mediaWarning\">");
-					$wgOut->addWikiText( wfMsg( 'mediawarning' ) );
-					$wgOut->addHTML('</div>');
-
+					$warning = wfMsg( 'mediawarning' );
+					$wgOut->addWikiText( <<<END
+<div class="fullMedia">
+<span class="dangerousLink">[[Media:$filename|$filename]]</span>
+<span class="fileInfo"> ($info)</span>
+</div>
+
+<div class="mediaWarning">$warning</div>
+END
+						);
 				} else {
-					$wgOut->addHTML("<div class=\"fullMedia\">");
-					$wgOut->addHTML($s);
-
-					$wgOut->addHTML("<span class=\"fileInfo\"> (");
-					$wgOut->addWikiText( $info, false );
-					$wgOut->addHTML(")</span>");
-
-					$wgOut->addHTML("</div>");
+					$wgOut->addWikiText( <<<END
+<div class="fullMedia">
+[[Media:$filename|$filename]] <span class="fileInfo"> ($info)</span>
+</div>
+END
+						);
 				}
 			}
 
-- 
2.20.1