Index: trunk/phase3/includes/Title.php |
— | — | @@ -1135,7 +1135,7 @@ |
1136 | 1136 | # XXX: this might be better using restrictions |
1137 | 1137 | # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssJsSubpage() from working |
1138 | 1138 | if( $this->isCssJsSubpage() |
1139 | | - && !$user->isAllowed('editinterface') |
| 1139 | + && !$user->isAllowed('editusercssjs') |
1140 | 1140 | && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) ) { |
1141 | 1141 | $errors[] = array('customcssjsprotected'); |
1142 | 1142 | } |
— | — | @@ -1394,7 +1394,7 @@ |
1395 | 1395 | */ |
1396 | 1396 | public function userCanEditCssJsSubpage() { |
1397 | 1397 | global $wgUser; |
1398 | | - return ( $wgUser->isAllowed('editinterface') or preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) ); |
| 1398 | + return ( $wgUser->isAllowed('editusercssjs') or preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) ); |
1399 | 1399 | } |
1400 | 1400 | |
1401 | 1401 | /** |
Index: trunk/phase3/includes/DefaultSettings.php |
— | — | @@ -264,7 +264,7 @@ |
265 | 265 | 'ftp://', |
266 | 266 | 'irc://', |
267 | 267 | 'gopher://', |
268 | | - 'telnet://', // Well if we're going to support the above.. -ævar |
| 268 | + 'telnet://', // Well if we're going to support the above.. -ævar |
269 | 269 | 'nntp://', // @bug 3808 RFC 1738 |
270 | 270 | 'worldwind://', |
271 | 271 | 'mailto:', |
— | — | @@ -1062,6 +1062,7 @@ |
1063 | 1063 | $wgGroupPermissions['sysop']['delete'] = true; |
1064 | 1064 | $wgGroupPermissions['sysop']['deletedhistory'] = true; // can view deleted history entries, but not see or restore the text |
1065 | 1065 | $wgGroupPermissions['sysop']['editinterface'] = true; |
| 1066 | +$wgGroupPermissions['sysop']['editusercssjs'] = true; |
1066 | 1067 | $wgGroupPermissions['sysop']['import'] = true; |
1067 | 1068 | $wgGroupPermissions['sysop']['importupload'] = true; |
1068 | 1069 | $wgGroupPermissions['sysop']['move'] = true; |
— | — | @@ -2133,7 +2134,7 @@ |
2134 | 2135 | '/^Mozilla\/4\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/', |
2135 | 2136 | |
2136 | 2137 | /** |
2137 | | - * MSIE on Mac OS 9 is teh sux0r, converts þ to <thorn>, ð to <eth>, Þ to <THORN> and Ð to <ETH> |
| 2138 | + * MSIE on Mac OS 9 is teh sux0r, converts þ to <thorn>, ð to <eth>, Þ to <THORN> and à to <ETH> |
2138 | 2139 | * |
2139 | 2140 | * Known useragents: |
2140 | 2141 | * - Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC) |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -40,6 +40,8 @@ |
41 | 41 | message. |
42 | 42 | * (bug 8759) Fixed bug where rollback was allowed on protected pages for wikis |
43 | 43 | where rollback is given to non-sysops. |
| 44 | +* (bug 8834) Split off permission for editing user JavaScript and CSS from |
| 45 | + editinterface to a new permission key editusercssjs. |
44 | 46 | |
45 | 47 | === API changes in 1.12 === |
46 | 48 | |