From ea706b47254cd5cc377a90a4d4ac93334c6d2298 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Tue, 18 May 2010 11:41:58 +0000 Subject: [PATCH] Followup r66566. wgUploadNavigationUrl is an external link. --- includes/Skin.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index 209b8f3868..7c3a84e69e 100644 --- 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 */ -- 2.20.1