[MediaWiki-commits] [Gerrit] Require a User object to be passed to EchoEvent::userCan() - change (mediawiki...Echo)

2015-11-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

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


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

All callers were already doing this.

Change-Id: If9e20e3d4740bcdb8842592e4cd988f8b35e1300
---
M includes/model/Event.php
1 file changed, 2 insertions(+), 7 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/model/Event.php b/includes/model/Event.php
index 4aff388..0f36efa 100644
--- a/includes/model/Event.php
+++ b/includes/model/Event.php
@@ -356,10 +356,10 @@
 * @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 @@
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 ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/255050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If9e20e3d4740bcdb8842592e4cd988f8b35e1300
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Require a User object to be passed to EchoEvent::userCan() - change (mediawiki...Echo)

2015-11-23 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/255050

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

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

All callers were already doing this.

Change-Id: If9e20e3d4740bcdb8842592e4cd988f8b35e1300
---
M includes/model/Event.php
1 file changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/50/255050/1

diff --git a/includes/model/Event.php b/includes/model/Event.php
index 4aff388..0f36efa 100644
--- a/includes/model/Event.php
+++ b/includes/model/Event.php
@@ -356,10 +356,10 @@
 * @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 @@
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 ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/255050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9e20e3d4740bcdb8842592e4cd988f8b35e1300
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits