* (bug 2372) Fix rendering of empty-title inline interwiki links

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7763238..34ef2bf 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -275,6 +275,7 @@ Various bugfixes, small features, and a few experimental things:
 * Changed user_groups format quite a bit.
 * (bug 2368) Avoid fatally breaking PHP 4.1.2 in a debug line
 * (bug 2367) Insert correct redirect link record on page move
+* (bug 2372) Fix rendering of empty-title inline interwiki links
 
 
 === Caveats ===

diff --git a/includes/Parser.php b/includes/Parser.php
index 0c7a142..fd9b960 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1433,7 +1433,13 @@ class Parser
                                $s .= $prefix . $sk->makeKnownLinkObj( $nt, $text, '', $trail );
                                continue;
                        }
-                       if ( $nt->isAlwaysKnown() ) {
+                       if( $nt->isLocal() && $nt->isAlwaysKnown() ) {
+                               /**
+                                * Skip lookups for special pages and self-links.
+                                * External interwiki links are not included here because
+                                * the HTTP urls would break output in the next parse step;
+                                * they will have placeholders kept.
+                                */
                                $s .= $sk->makeKnownLinkObj( $nt, $text, '', $trail, $prefix );
                        } else {
                                /**

diff --git a/includes/Title.php b/includes/Title.php
index 2c5111a..92d813a 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1969,7 +1969,7 @@ class Title {
         * 
         */
        function isAlwaysKnown() {
-               return ( 0 == $this->mNamespace && "" == $this->mDbkeyform ) 
+               return $this->isExternal() || ( 0 == $this->mNamespace && "" == $this->mDbkeyform ) 
                  || NS_SPECIAL == $this->mNamespace || NS_IMAGE == $this->mNamespace;
        }
 

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 846ed08..f644fe2 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -1069,6 +1069,15 @@ Inline interwiki link
 </p>
 !! end
 
+!! test
+Inline interwiki link with empty title (bug 2372)
+!! input
+[[MeatBall:]]
+!! result
+<p><a href="http://www.usemod.com/cgi-bin/mb.pl?" class='extiw' title="MeatBall:">MeatBall:</a>
+</p>
+!! end
+
 !! test
 Interwiki link encoding conversion (bug 1636)
 !! input