From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Wed, 27 Oct 2010 01:56:23 +0000 (+0000)
Subject: Line endings in wikitext can introduce <p>'s, which was not really the intent here... 
X-Git-Tag: 1.31.0-rc.0~34278
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=cf67f54f4fc8c37972b4e65a329605d6a98787bb;p=lhc%2Fweb%2Fwiklou.git

Line endings in wikitext can introduce <p>'s, which was not really the intent here for the fullMedia div.
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index e9be037009..e53be2698a 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -473,18 +473,13 @@ class ImagePage extends Article {
 				if ( !$this->displayImg->isSafeFile() ) {
 					$warning = wfMsgNoTrans( 'mediawarning' );
 					$wgOut->addWikiText( <<<EOT
-<div class="fullMedia">
-<span class="dangerousLink">{$medialink}</span>$dirmark
-<span class="fileInfo">$longDesc</span>
-</div>
+<div class="fullMedia"><span class="dangerousLink">{$medialink}</span>$dirmark <span class="fileInfo">$longDesc</span></div>
 <div class="mediaWarning">$warning</div>
 EOT
 						);
 				} else {
 					$wgOut->addWikiText( <<<EOT
-<div class="fullMedia">
-{$medialink}{$dirmark}
-<span class="fileInfo">$longDesc</span>
+<div class="fullMedia">{$medialink}{$dirmark} <span class="fileInfo">$longDesc</span>
 </div>
 EOT
 					);