r75500 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r75499‎ | r75500 | r75501 >
Date:01:56, 27 October 2010
Author:hartman
Status:ok
Tags:
Comment:
Line endings in wikitext can introduce <p>'s, which was not really the intent here for the fullMedia div.
Modified paths:
  • /trunk/phase3/includes/ImagePage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/ImagePage.php
@@ -473,18 +473,13 @@
474474 if ( !$this->displayImg->isSafeFile() ) {
475475 $warning = wfMsgNoTrans( 'mediawarning' );
476476 $wgOut->addWikiText( <<<EOT
477 -<div class="fullMedia">
478 -<span class="dangerousLink">{$medialink}</span>$dirmark
479 -<span class="fileInfo">$longDesc</span>
480 -</div>
 477+<div class="fullMedia"><span class="dangerousLink">{$medialink}</span>$dirmark <span class="fileInfo">$longDesc</span></div>
481478 <div class="mediaWarning">$warning</div>
482479 EOT
483480 );
484481 } else {
485482 $wgOut->addWikiText( <<<EOT
486 -<div class="fullMedia">
487 -{$medialink}{$dirmark}
488 -<span class="fileInfo">$longDesc</span>
 483+<div class="fullMedia">{$medialink}{$dirmark} <span class="fileInfo">$longDesc</span>
489484 </div>
490485 EOT
491486 );

Status & tagging log