Follow up r57530 elsewhere

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 4601c5a..cb28c64 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -448,9 +448,14 @@ class ChangesList {
        public static function userCan( $rc, $field ) {
                if( $rc->mAttribs['rc_deleted'] & $field ) {
                        global $wgUser;
-                       $permission = ( $rc->mAttribs['rc_deleted'] & Revision::DELETED_RESTRICTED )
-                               ? 'suppressrevision'
-                               : ( $field & Revision::DELETED_TEXT ) ? 'deletedtext' : 'deletedhistory';
+                       $permission = '';
+                       if ( $rc->mAttribs['rc_deleted'] & self::DELETED_RESTRICTED ) {
+                               $permission = 'suppressrevision';
+                       } elseif ( $field & self::DELETED_TEXT ) {
+                               $permission = 'deletedtext';
+                       } else {
+                               $permission = 'deletedhistory';
+                       }
                        wfDebug( "Checking for $permission due to $field match on {$rc->mAttribs['rc_deleted']}\n" );
                        return $wgUser->isAllowed( $permission );
                } else {

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 6fdf0a9..5196cab 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -549,9 +549,14 @@ class LogEventsList {
        public static function userCan( $row, $field ) {
                if( $row->log_deleted & $field ) {
                        global $wgUser;
-                       $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED )
-                               ? 'suppressrevision'
-                               : 'deletedhistory';
+                       $permission = '';
+                       if ( $this->log_deleted & self::DELETED_RESTRICTED ) {
+                               $permission = 'suppressrevision';
+                       } elseif ( $field & self::DELETED_TEXT ) {
+                               $permission = 'deletedtext';
+                       } else {
+                               $permission = 'deletedhistory';
+                       }
                        wfDebug( "Checking for $permission due to $field match on $row->log_deleted\n" );
                        return $wgUser->isAllowed( $permission );
                } else {

diff --git a/includes/Revision.php b/includes/Revision.php
index eee97cb..b7fb269 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -979,7 +979,6 @@ class Revision {
        public function userCan( $field ) {
                if( $this->mDeleted & $field ) {
                        global $wgUser;
-                       
                        $permission = '';
                        if ( $this->mDeleted & self::DELETED_RESTRICTED ) {
                                $permission = 'suppressrevision';
@@ -988,7 +987,6 @@ class Revision {
                        } else {
                                $permission = 'deletedhistory';
                        }
-                       
                        wfDebug( "Checking for $permission due to $field match on $this->mDeleted\n" );
                        return $wgUser->isAllowed( $permission );
                } else {

diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php
index 1c22ba2..118fe65 100644 (file)
--- a/includes/filerepo/ArchivedFile.php
+++ b/includes/filerepo/ArchivedFile.php
@@ -379,9 +379,14 @@ class ArchivedFile
                $this->load();
                if( $this->deleted & $field ) {
                        global $wgUser;
-                       $permission = ( $this->deleted & File::DELETED_RESTRICTED )
-                               ? 'suppressrevision'
-                               : ( $field & File::DELETED_FILE ) ? 'deletedtext' : 'deletedhistory';
+                       $permission = '';
+                       if ( $this->deleted & self::DELETED_RESTRICTED ) {
+                               $permission = 'suppressrevision';
+                       } elseif ( $field & self::DELETED_TEXT ) {
+                               $permission = 'deletedtext';
+                       } else {
+                               $permission = 'deletedhistory';
+                       }
                        wfDebug( "Checking for $permission due to $field match on $this->deleted\n" );
                        return $wgUser->isAllowed( $permission );
                } else {

diff --git a/includes/filerepo/OldLocalFile.php b/includes/filerepo/OldLocalFile.php
index 4c31997..171a0fd 100644 (file)
--- a/includes/filerepo/OldLocalFile.php
+++ b/includes/filerepo/OldLocalFile.php
@@ -197,9 +197,14 @@ class OldLocalFile extends LocalFile {
        function userCan( $field ) {
                if( isset($this->deleted) && ($this->deleted & $field) ) {
                        global $wgUser;
-                       $permission = ( $this->deleted & File::DELETED_RESTRICTED )
-                               ? 'suppressrevision'
-                               : ( $field & File::DELETED_FILE ) ? 'deletedtext' : 'deletedhistory';
+                       $permission = '';
+                       if ( $this->deleted & self::DELETED_RESTRICTED ) {
+                               $permission = 'suppressrevision';
+                       } elseif ( $field & self::DELETED_TEXT ) {
+                               $permission = 'deletedtext';
+                       } else {
+                               $permission = 'deletedhistory';
+                       }
                        wfDebug( "Checking for $permission due to $field match on $this->mDeleted\n" );
                        return $wgUser->isAllowed( $permission );
                } else {