r25720 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r25719‎ | r25720 | r25721 >
Date:08:10, 10 September 2007
Author:werdna
Status:old
Tags:
Comment:
* (bug 8834) Split off permission for editing user JavaScript and CSS from editinterface to a new permission key editusercssjs.
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/DefaultSettings.php (modified) (history)
  • /trunk/phase3/includes/Title.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Title.php
@@ -1135,7 +1135,7 @@
11361136 # XXX: this might be better using restrictions
11371137 # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssJsSubpage() from working
11381138 if( $this->isCssJsSubpage()
1139 - && !$user->isAllowed('editinterface')
 1139+ && !$user->isAllowed('editusercssjs')
11401140 && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) ) {
11411141 $errors[] = array('customcssjsprotected');
11421142 }
@@ -1394,7 +1394,7 @@
13951395 */
13961396 public function userCanEditCssJsSubpage() {
13971397 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) );
13991399 }
14001400
14011401 /**
Index: trunk/phase3/includes/DefaultSettings.php
@@ -264,7 +264,7 @@
265265 'ftp://',
266266 'irc://',
267267 '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
269269 'nntp://', // @bug 3808 RFC 1738
270270 'worldwind://',
271271 'mailto:',
@@ -1062,6 +1062,7 @@
10631063 $wgGroupPermissions['sysop']['delete'] = true;
10641064 $wgGroupPermissions['sysop']['deletedhistory'] = true; // can view deleted history entries, but not see or restore the text
10651065 $wgGroupPermissions['sysop']['editinterface'] = true;
 1066+$wgGroupPermissions['sysop']['editusercssjs'] = true;
10661067 $wgGroupPermissions['sysop']['import'] = true;
10671068 $wgGroupPermissions['sysop']['importupload'] = true;
10681069 $wgGroupPermissions['sysop']['move'] = true;
@@ -2133,7 +2134,7 @@
21342135 '/^Mozilla\/4\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
21352136
21362137 /**
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>
21382139 *
21392140 * Known useragents:
21402141 * - Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC)
Index: trunk/phase3/RELEASE-NOTES
@@ -40,6 +40,8 @@
4141 message.
4242 * (bug 8759) Fixed bug where rollback was allowed on protected pages for wikis
4343 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.
4446
4547 === API changes in 1.12 ===
4648

Follow-up revisions

RevisionCommit summaryAuthorDate
r25754Merged revisions 25607-25751 via svnmerge from...david23:02, 10 September 2007

Status & tagging log