Don't display Upload link in Monobook sidebar if uploading is disabled.

diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 4fe28c4..7d6e2b9 100644 (file)
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -465,7 +465,7 @@ if( defined( "MEDIAWIKI" ) ) {
                # build array of common navigation links
                function buildNavUrls () {
                        global $wgTitle, $wgUser, $wgRequest;
-                       global $wgSiteSupportPage;
+                       global $wgSiteSupportPage, $wgDisableUploads;
 
                        $action = $wgRequest->getText( 'action' );
                        $oldid = $wgRequest->getVal( 'oldid' );
@@ -483,7 +483,9 @@ if( defined( "MEDIAWIKI" ) ) {
                        // $nav_urls['sitesupport'] = array('href' => htmlspecialchars( $this->makeI18nUrl('sitesupportpage')));
                        $nav_urls['sitesupport'] = array('href' => htmlspecialchars( $wgSiteSupportPage));
                        $nav_urls['help'] = array('href' => htmlspecialchars( $this->makeI18nUrl('helppage')));
-                       $nav_urls['upload'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Upload')));
+                       if( $this->loggedin && !$wgDisableUploads ) {
+                               $nav_urls['upload'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Upload')));
+                       }
                        $nav_urls['specialpages'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Specialpages')));
 
                        if( $wgTitle->getNamespace() == NS_USER || $wgTitle->getNamespace() == NS_USER_TALK ) {

diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt
index 23ea304..33b6b8f 100644 (file)
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -112,7 +112,7 @@
                i18n:translate="string:contributions">Contributions</a></li>
              <li id="t-emailuser" tal:condition="nav_urls/emailuser/href"><a href="${nav_urls/emailuser/href}"
                i18n:translate="string:emailuser">Email this user</a></li>
-             <li id="t-upload" tal:condition="loggedin"><a href="${nav_urls/upload/href}"
+             <li id="t-upload" tal:condition="nav_urls/upload/href"><a href="${nav_urls/upload/href}"
                i18n:translate="string:upload">Upload a file</a></li>
              <li id="t-specialpages"><a href="${nav_urls/specialpages/href}"
                i18n:translate="string:specialpages">Special Pages</a></li>