http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90857
Revision: 90857
Author: happy-melon
Date: 2011-06-26 22:05:27 +0000 (Sun, 26 Jun 2011)
Log Message:
-----------
Follow-up r84251 - isAllowed( 'right', 'or-another-right' ) was reverted.
Modified Paths:
--------------
trunk/extensions/GlobalBlocking/GlobalBlocking.class.php
Modified: trunk/extensions/GlobalBlocking/GlobalBlocking.class.php
===================================================================
--- trunk/extensions/GlobalBlocking/GlobalBlocking.class.php 2011-06-26
21:50:24 UTC (rev 90856)
+++ trunk/extensions/GlobalBlocking/GlobalBlocking.class.php 2011-06-26
22:05:27 UTC (rev 90857)
@@ -44,7 +44,7 @@
return $result = array();
}
- if ( $user->isAllowed( 'ipblock-exempt',
'globalblock-exempt' ) ) {
+ if ( $user->isAllowed( 'ipblock-exempt' ) ||
$user->isAllowed( 'globalblock-exempt' ) ) {
// User is exempt from IP blocks.
return $result = array();
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
