Use isDeleted()

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 27ec3f7..a81068d 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -19,6 +19,7 @@
 
 class LogEventsList {
        const NO_ACTION_LINK = 1;
+       
        private $skin;
        public $flags;
 
@@ -252,7 +253,7 @@ class LogEventsList {
                        }
                }
                // Event description
-               if( $row->log_deleted & LogPage::DELETED_ACTION ) {
+               if( self::isDeleted($row,LogPage::DELETED_ACTION) ) {
                        $action = '<span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
                } else {
                        $action = LogPage::actionText( $row->log_type, $row->log_action, $title, $this->skin, $paramArray, true );
@@ -287,28 +288,6 @@ class LogEventsList {
                return "<tt>(<small>$del</small>)</tt>";
        }
        
-       /**
-        * SQL clause to skip forbidden log types for this user
-        * @param Database $db
-        * @returns mixed (string or false)
-        */
-       public static function getExcludeClause( $db ) {
-               global $wgLogRestrictions, $wgUser;
-               // Reset the array, clears extra "where" clauses when $par is used
-               $hiddenLogs = array();
-               // Don't show private logs to unpriviledged users
-               foreach( $wgLogRestrictions as $logtype => $right ) {
-                       if( !$wgUser->isAllowed($right) ) {
-                               $safetype = $db->strencode( $logtype );
-                               $hiddenLogs[] = "'$safetype'";
-                       }
-               }
-               if( !empty($hiddenLogs) ) {
-                       return 'log_type NOT IN(' . implode(',',$hiddenLogs) . ')';
-               }
-               return false;
-       }
-       
        /**
         * Determine if the current user is allowed to view a particular
         * field of this log row, if it's marked as deleted.
@@ -337,6 +316,28 @@ class LogEventsList {
        public static function isDeleted( $row, $field ) {
                return ($row->log_deleted & $field) == $field;
        }
+       
+       /**
+        * SQL clause to skip forbidden log types for this user
+        * @param Database $db
+        * @returns mixed (string or false)
+        */
+       public static function getExcludeClause( $db ) {
+               global $wgLogRestrictions, $wgUser;
+               // Reset the array, clears extra "where" clauses when $par is used
+               $hiddenLogs = array();
+               // Don't show private logs to unpriviledged users
+               foreach( $wgLogRestrictions as $logtype => $right ) {
+                       if( !$wgUser->isAllowed($right) ) {
+                               $safetype = $db->strencode( $logtype );
+                               $hiddenLogs[] = "'$safetype'";
+                       }
+               }
+               if( !empty($hiddenLogs) ) {
+                       return 'log_type NOT IN(' . implode(',',$hiddenLogs) . ')';
+               }
+               return false;
+       }
 }
 
 /**