* (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!

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 321e2fe..3b4169f 100644 (file)
--- 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 f3ead55..f7aec17 100644 (file)
--- 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
+                                               );
                                }
                        }