Touch up Title::get[Full|Local]URL. This concept of "if not an existing interwiki...

Instead of having getFullURL and getLocalURL call each other, move the interwiki workload into getLocalURL, and make getFullURL simply call getLocalURL then expand it (use the wf method in case it's already a full url) and append the fragment to it.

diff --git a/includes/Title.php b/includes/Title.php
index 65dd8b6..ba86d60 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -837,30 +837,14 @@ class Title {
        public function getFullURL( $query = '', $variant = false ) {
                global $wgServer, $wgRequest;
 
-               if ( is_array( $query ) ) {
-                       $query = wfArrayToCGI( $query );
-               }
-
-               $interwiki = Interwiki::fetch( $this->mInterwiki );
-               if ( !$interwiki ) {
-                       $url = $this->getLocalURL( $query, $variant );
-
-                       // Ugly quick hack to avoid duplicate prefixes (bug 4571 etc)
-                       // Correct fix would be to move the prepending elsewhere.
-                       if ( $wgRequest->getVal( 'action' ) != 'render' ) {
-                               $url = $wgServer . $url;
-                       }
-               } else {
-                       $namespace = $this->getNsText();
-                       if ( $namespace != '' ) {
-                               # Can this actually happen? Interwikis shouldn't be parsed.
-                               # Yes! It can in interwiki transclusion. But... it probably shouldn't.
-                               $namespace .= ':';
-                       }
-                       $url = $interwiki->getURL( $namespace . $this->getDBkey() );
-                       $url = wfAppendQuery( $url, $query );
-               }
-
+               # Hand off all the decisions on urls to getLocalURL
+               $url = $this->getLocalURL( $query, $variant );
+               
+               # Expand the url to make it a full url. Note that getLocalURL has the
+               # potential to output full urls for a variety of reasons, so we use
+               # wfExpandUrl instead of simply prepending $wgServer
+               $url = wfExpandUrl( $url );
+               
                # Finally, add the fragment.
                $url .= $this->getFragmentForURL();
 
@@ -887,15 +871,16 @@ class Title {
                        $query = wfArrayToCGI( $query );
                }
 
-               if ( $this->isExternal() ) {
-                       $url = $this->getFullURL();
-                       if ( $query ) {
-                               // This is currently only used for edit section links in the
-                               // context of interwiki transclusion. In theory we should
-                               // append the query to the end of any existing query string,
-                               // but interwiki transclusion is already broken in that case.
-                               $url .= "?$query";
+               $interwiki = Interwiki::fetch( $this->mInterwiki );
+               if ( $interwiki ) {
+                       $namespace = $this->getNsText();
+                       if ( $namespace != '' ) {
+                               # Can this actually happen? Interwikis shouldn't be parsed.
+                               # Yes! It can in interwiki transclusion. But... it probably shouldn't.
+                               $namespace .= ':';
                        }
+                       $url = $interwiki->getURL( $namespace . $this->getDBkey() );
+                       $url = wfAppendQuery( $url, $query );
                } else {
                        $dbkey = wfUrlencode( $this->getPrefixedDBkey() );
                        if ( $query == '' ) {