Followup r66566. wgUploadNavigationUrl is an external link.

diff --git a/includes/Skin.php b/includes/Skin.php
index 209b8f3..7c3a84e 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1992,19 +1992,17 @@ CSS;
                global $wgUploadNavigationUrl;
 
                if( $wgUploadNavigationUrl ) {
-                       $title = Title::newFromText( $wgUploadNavigationUrl );
-               }
-               if( !isset( $title ) ) {
-                       $title = SpecialPage::getTitleFor('Upload');
+                       # Using an empty class attribute to avoid automatic setting of "external" class
+                       return $this->makeExternalLink( $wgUploadNavigationUrl, wfMsgHtml( 'upload' ), false, null, array( 'class' => '') );
+               } else {
+                       return $this->link(
+                               SpecialPage::getTitleFor('Upload'),
+                               wfMsgHtml( 'upload' ),
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                       );
                }
-
-               return $this->link(
-                        $title,
-                        wfMsgHtml( 'upload' ),
-                        array(),
-                        array(),
-                        array( 'known', 'noclasses' )
-                );
        }
 
        /* these are used extensively in SkinTemplate, but also some other places */