r61749 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r61748‎ | r61749 | r61750 >
Date:18:26, 31 January 2010
Author:maxsem
Status:ok
Tags:
Comment:
(bug 16039) Text disappearing after a bad image
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/parser/Parser.php (modified) (history)
  • /trunk/phase3/maintenance/parserTests.txt (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/parserTests.txt
@@ -7751,7 +7751,19 @@
77527752 !! result
77537753 !! end
77547754
 7755+!! test
 7756+Bad images - bug 16039: text after bad image disappears
 7757+!! input
 7758+Foo bar
 7759+[[File:Bad.jpg]]
 7760+Bar foo
 7761+!! result
 7762+<p>Foo bar
 7763+</p><p>Bar foo
 7764+</p>
 7765+!! end
77557766
 7767+
77567768 TODO:
77577769 more images
77587770 more tables
Index: trunk/phase3/includes/parser/Parser.php
@@ -1738,6 +1738,8 @@
17391739 }
17401740 # cloak any absolute URLs inside the image markup, so replaceExternalLinks() won't touch them
17411741 $s .= $prefix . $this->armorLinks( $this->makeImage( $nt, $text, $holders ) ) . $trail;
 1742+ } else {
 1743+ $s .= $prefix . $trail;
17421744 }
17431745 $this->mOutput->addImage( $nt->getDBkey() );
17441746 wfProfileOut( __METHOD__."-image" );
Index: trunk/phase3/RELEASE-NOTES
@@ -729,6 +729,7 @@
730730 * Fixed bug involving unclosed "-{" markup in the language converter
731731 * (bug 21870) No longer include Google logo from an external server on wiki error.
732732 * (bug 22181) Do not truncate if the ellipsis actually make the string longer
 733+* (bug 16039) Text disappearing after a bad image
733734
734735 == API changes in 1.16 ==
735736

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r61748Rv extra precautions from r61465. I think I was confused by bug 16039 into ad...maxsem18:16, 31 January 2010

Status & tagging log