From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 27 Jan 2009 03:13:57 +0000 (+0000)
Subject: Tweak r46117 to check $wgAllowUserCss, $wgAllowUserJs
X-Git-Tag: 1.31.0-rc.0~43223
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=1e0867ce56db58d8b93031165999dcfdf661cdb1;p=lhc%2Fweb%2Fwiklou.git

Tweak r46117 to check $wgAllowUserCss, $wgAllowUserJs
---

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index 922be9e1bb..11c450bcf0 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -894,11 +894,17 @@ class PreferencesForm {
 				$previewlink = "(<a target='_blank' href=\"$mplink\">$previewtext</a>)";
 				$extraLinks = '';
 				if( $skinkey == $this->mSkin ) {
-					$cssPage = Title::makeTitleSafe( NS_USER, $wgUser->getName().'/'.$skinkey.'.css' );
-					$jsPage = Title::makeTitleSafe( NS_USER, $wgUser->getName().'/'.$skinkey.'.js' );
-					$customCSS = $sk->makeLinkObj( $cssPage, wfMsgExt('prefs-custom-css', array() ) );
-					$customJS = $sk->makeLinkObj( $jsPage, wfMsgHtml('prefs-custom-js') );
-					$extraLinks = " ($customCSS) ($customJS)";
+					global $wgAllowUserCss, $wgAllowUserJs;
+					if( $wgAllowUserCss ) {
+						$cssPage = Title::makeTitleSafe( NS_USER, $wgUser->getName().'/'.$skinkey.'.css' );
+						$customCSS = $sk->makeLinkObj( $cssPage, wfMsgExt('prefs-custom-css', array() ) );
+						$extraLinks .= " ($customCSS)";
+					}
+					if( $wgAllowUserJs ) {
+						$jsPage = Title::makeTitleSafe( NS_USER, $wgUser->getName().'/'.$skinkey.'.js' );
+						$customJS = $sk->makeLinkObj( $jsPage, wfMsgHtml('prefs-custom-js') );
+						$extraLinks .= " ($customJS)";
+					}
 				}
 				if( $skinkey == $wgDefaultSkin )
 					$sn .= ' (' . wfMsg( 'default' ) . ')';