Fix #5586: <gallery> treats text as links

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c7ec009..c5a22ab 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -230,6 +230,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Added grammar function to Belarusian (be)
 * (bug 5819) Add 'PersonalUrls' hook
 * (bug 5862) Update of Belarusian language (be)
+* (bug 5586) <gallery> treated text as links
 
 == Compatibility ==
 

diff --git a/includes/Parser.php b/includes/Parser.php
index 958c1bf..8976971 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -3937,7 +3937,11 @@ class Parser
                        $html = $pout->getText();
 
                        $ig->add( new Image( $nt ), $html );
-                       $this->mOutput->addImage( $nt->getDBkey() );
+
+                       # Only add real images (bug #5586)
+                       if ( $nt->getNamespace() == NS_IMAGE ) {
+                               $this->mOutput->addImage( $nt->getDBkey() );
+                       }
                }
                return $ig->toHTML();
        }