Tweak code style a little more: add more escaping and make the default value for...

[lhc/web/wiklou.git] / includes / LogEventsList.php

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 058ca01..d963541 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -24,9 +24,9 @@ class LogEventsList {
        private $out;
        public $flags;
 
-       function __construct( &$skin, &$out, $flags = 0 ) {
-               $this->skin =& $skin;
-               $this->out =& $out;
+       function __construct( $skin, $out, $flags = 0 ) {
+               $this->skin = $skin;
+               $this->out = $out;
                $this->flags = $flags;
                $this->preCacheMessages();
        }
@@ -232,7 +232,7 @@ class LogEventsList {
                                $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete' ),
                                        $this->message['undeletelink'], 'target='. urlencode( $title->getPrefixedDBkey() ) ) . ')';
                        // Show unblock link
-                       } else if( self::typeAction($row,'block','block') && $wgUser->isAllowed( 'block' ) ) {
+                       } else if( self::typeAction($row,array('block','suppress'),'block') && $wgUser->isAllowed( 'block' ) ) {
                                $revert = '(' .  $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Ipblocklist' ),
                                        $this->message['unblocklink'],
                                        'action=unblock&ip=' . urlencode( $row->log_title ) ) . ')';
@@ -338,7 +338,7 @@ class LogEventsList {
                if( ( $row->log_deleted & $field ) == $field ) {
                        global $wgUser;
                        $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED ) == LogPage::DELETED_RESTRICTED
-                               ? 'hiderevision'
+                               ? 'suppressrevision'
                                : 'deleterevision';
                        wfDebug( "Checking for $permission due to $field match on $row->log_deleted\n" );
                        return $wgUser->isAllowed( $permission );
@@ -406,7 +406,7 @@ class LogEventsList {
 }
 
 /**
- * @addtogroup Pager
+ * @ingroup Pager
  */
 class LogPager extends ReverseChronologicalPager {
        private $type = '', $user = '', $title = '', $pattern = '', $year = '', $month = '';
@@ -625,8 +625,8 @@ class LogPager extends ReverseChronologicalPager {
 }
 
 /**
- * @Deprecated
- * @addtogroup SpecialPage
+ * @deprecated
+ * @ingroup SpecialPage
  */
 class LogReader {
        var $pager;
@@ -663,8 +663,8 @@ class LogReader {
 }
 
 /**
- * @Deprecated
- * @addtogroup SpecialPage
+ * @deprecated
+ * @ingroup SpecialPage
  */
 class LogViewer {
        const NO_ACTION_LINK = 1;