(bug 16039) Text disappearing after a bad image

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ef773d7..01f4756 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -729,6 +729,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Fixed bug involving unclosed "-{" markup in the language converter
 * (bug 21870) No longer include Google logo from an external server on wiki error.
 * (bug 22181) Do not truncate if the ellipsis actually make the string longer
+* (bug 16039) Text disappearing after a bad image
 
 == API changes in 1.16 ==
 

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 32ded4b..e5e92e0 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1738,6 +1738,8 @@ class Parser
                                                }
                                                # cloak any absolute URLs inside the image markup, so replaceExternalLinks() won't touch them
                                                $s .= $prefix . $this->armorLinks( $this->makeImage( $nt, $text, $holders ) ) . $trail;
+                                       } else {
+                                               $s .= $prefix . $trail;
                                        }
                                        $this->mOutput->addImage( $nt->getDBkey() );
                                        wfProfileOut( __METHOD__."-image" );

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 6695973..b00df4d 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -7751,6 +7751,18 @@ Bad images - basic functionality
 !! result
 !! end
 
+!! test
+Bad images - bug 16039: text after bad image disappears
+!! input
+Foo bar
+[[File:Bad.jpg]]
+Bar foo
+!! result
+<p>Foo bar
+</p><p>Bar foo
+</p>
+!! end
+
 
 TODO:
 more images