Revision: 46313
Author:   aaron
Date:     2009-01-27 03:13:57 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
Tweak r46117 to check $wgAllowUserCss, $wgAllowUserJs

Modified Paths:
--------------
    trunk/phase3/includes/specials/SpecialPreferences.php

Modified: trunk/phase3/includes/specials/SpecialPreferences.php
===================================================================
--- trunk/phase3/includes/specials/SpecialPreferences.php       2009-01-27 
03:09:20 UTC (rev 46312)
+++ trunk/phase3/includes/specials/SpecialPreferences.php       2009-01-27 
03:13:57 UTC (rev 46313)
@@ -894,11 +894,17 @@
                                $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' ) . ')';



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to