wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-09-23 18:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require a User object to be passed to EchoEvent::userCan()

Browse source 
All callers were already doing this.

Change-Id: If9e20e3d4740bcdb8842592e4cd988f8b35e1300
This commit is contained in:
Kunal Mehta 2015-11-23 16:08:17 -08:00
parent 6eba89d400
commit 5be28ba4df
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/model/Event.php
View file

@ -356,10 +356,10 @@ class EchoEvent extends EchoAbstractEntity {
* @param $field Integer:one of Revision::DELETED_TEXT,
* Revision::DELETED_COMMENT,
* Revision::DELETED_USER
* @param $user User object to check, or null to use $wgUser
* @param $user User object to check
* @return Boolean
*/
public function userCan( $field, User $user = null ) {
public function userCan( $field, User $user ) {
$revision = $this->getRevision();
// User is handled specially
if ( $field === Revision::DELETED_USER ) {
@ -374,11 +374,6 @@ class EchoEvent extends EchoAbstractEntity {
return $revision->userCan( $field, $user );
} else {
// Use User::isHidden()
if ( !$user ) {
// @FIXME Require a user object for this function
global $wgUser;
$user = $wgUser;
}
return $user->isAllowedAny( 'viewsuppressed', 'hideuser' ) || !$agent->isHidden();
}
} elseif ( $revision ) {