* (bug 8834) Split off permission for editing user JavaScript and CSS from editinterf...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 482c35d..1f83f5a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -40,6 +40,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   message.
 * (bug 8759) Fixed bug where rollback was allowed on protected pages for wikis
   where rollback is given to non-sysops.
+* (bug 8834) Split off permission for editing user JavaScript and CSS from
+  editinterface to a new permission key editusercssjs.
 
 === API changes in 1.12 ===
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b83b5cf..5479b4d 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -264,7 +264,7 @@ $wgUrlProtocols = array(
        'ftp://',
        'irc://',
        'gopher://',
-       'telnet://', // Well if we're going to support the above.. -ævar
+       'telnet://', // Well if we're going to support the above.. -Ã\83¦var
        'nntp://', // @bug 3808 RFC 1738
        'worldwind://',
        'mailto:',
@@ -1062,6 +1062,7 @@ $wgGroupPermissions['sysop']['createaccount']   = true;
 $wgGroupPermissions['sysop']['delete']          = true;
 $wgGroupPermissions['sysop']['deletedhistory']         = true; // can view deleted history entries, but not see or restore the text
 $wgGroupPermissions['sysop']['editinterface']   = true;
+$wgGroupPermissions['sysop']['editusercssjs']   = true;
 $wgGroupPermissions['sysop']['import']          = true;
 $wgGroupPermissions['sysop']['importupload']    = true;
 $wgGroupPermissions['sysop']['move']            = true;
@@ -2133,7 +2134,7 @@ $wgBrowserBlackList = array(
        '/^Mozilla\/4\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
        
        /**
-        * MSIE on Mac OS 9 is teh sux0r, converts þ to <thorn>, ð to <eth>, Ã\9e to <THORN> and Ã\90 to <ETH>
+        * MSIE on Mac OS 9 is teh sux0r, converts Ã\83¾ to <thorn>, Ã\83° to <eth>, Ã\83ž to <THORN> and Ã\83Â\90 to <ETH>
         *
         * Known useragents:
         * - Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC)

diff --git a/includes/Title.php b/includes/Title.php
index a8e6ff7..e9f2e20 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1135,7 +1135,7 @@ class Title {
                # XXX: this might be better using restrictions
                # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssJsSubpage() from working
                if( $this->isCssJsSubpage()
-                       && !$user->isAllowed('editinterface')
+                       && !$user->isAllowed('editusercssjs')
                        && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) ) {
                        $errors[] = array('customcssjsprotected');
                }
@@ -1394,7 +1394,7 @@ class Title {
         */
        public function userCanEditCssJsSubpage() {
                global $wgUser;
-               return ( $wgUser->isAllowed('editinterface') or preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
+               return ( $wgUser->isAllowed('editusercssjs') or preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
        }
 
        /**