Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Actually, revert r32370. It might be a good idea, but it breaks the UserGetRights hook (more than it already is). Could use some more thought.

Browse source
This commit is contained in:
Aryeh Gregor 2008-03-24 13:47:16 +00:00
parent 73c025c25c
commit b9a8ffba8b
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Namespace.php
View file

@ -165,4 +165,4 @@ class MWNamespace {
return $index >= NS_MAIN;
}
}
}

6
includes/Title.php
View file

@ -1387,7 +1387,7 @@ class Title {
* @todo fold these checks into userCan()
*/
public function userCanRead() {
global $wgUser;
global $wgUser, $wgGroupPermissions;
$result = null;
wfRunHooks( 'userCan', array( &$this, &$wgUser, 'read', &$result ) );
@ -1395,6 +1395,10 @@ class Title {
return $result;
}
# Shortcut for public wikis, allows skipping quite a bit of code
if ($wgGroupPermissions['*']['read'])
return true;
if( $wgUser->isAllowed( 'read' ) ) {
return true;
} else {

9
includes/User.php
View file

@ -1770,16 +1770,9 @@ class User {
* @return boolean True: action is allowed, False: action should not be allowed
*/
function isAllowed($action='') {
global $wgGroupPermissions;
if( $action === '' ) {
if ( $action === '' )
// In the spirit of DWIM
return true;
}
if( !empty( $wgGroupPermissions['*'][$action] ) ) {
# Permissions are additive, so there's no need to unstub the User
# object in this case.
return true;
}
return in_array( $action, $this->getRights() );
}