Swap else if for elseif

[lhc/web/wiklou.git] / includes / api / ApiQueryLogEvents.php

diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index 0ba070c..e051c83 100644 (file)
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -86,13 +86,10 @@ class ApiQueryLogEvents extends ApiQueryBase {
                        'log_deleted',
                ) );
 
-               $this->addFieldsIf( 'log_id', $this->fld_ids );
-               $this->addFieldsIf( 'page_id', $this->fld_ids );
-               $this->addFieldsIf( 'log_user', $this->fld_user );
-               $this->addFieldsIf( 'user_name', $this->fld_user );
+               $this->addFieldsIf( array( 'log_id', 'page_id' ), $this->fld_ids );
+               $this->addFieldsIf( array( 'log_user', 'user_name' ), $this->fld_user );
                $this->addFieldsIf( 'user_id', $this->fld_userid );
-               $this->addFieldsIf( 'log_namespace', $this->fld_title || $this->fld_parsedcomment );
-               $this->addFieldsIf( 'log_title', $this->fld_title || $this->fld_parsedcomment );
+               $this->addFieldsIf( array( 'log_namespace', 'log_title' ), $this->fld_title || $this->fld_parsedcomment );
                $this->addFieldsIf( 'log_comment', $this->fld_comment || $this->fld_parsedcomment );
                $this->addFieldsIf( 'log_params', $this->fld_details );
 
@@ -114,8 +111,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
                        list( $type, $action ) = explode( '/', $params['action'] );
                        $this->addWhereFld( 'log_type', $type );
                        $this->addWhereFld( 'log_action', $action );
-               }
-               else if ( !is_null( $params['type'] ) ) {
+               } elseif ( !is_null( $params['type'] ) ) {
                        $this->addWhereFld( 'log_type', $params['type'] );
                        $index['logging'] = 'type_time';
                }
@@ -197,15 +193,15 @@ class ApiQueryLogEvents extends ApiQueryBase {
        }
 
        /**
-        * @static
         * @param $result ApiResult
-        * @param $vals
-        * @param $params
-        * @param $type
+        * @param $vals array
+        * @param $params string
+        * @param $type string
+        * @param $action string
         * @param $ts
         * @return array
         */
-       public static function addLogParams( $result, &$vals, $params, $type, $ts ) {
+       public static function addLogParams( $result, &$vals, $params, $type, $action, $ts ) {
                $params = explode( "\n", $params );
                switch ( $type ) {
                        case 'move':
@@ -235,11 +231,14 @@ class ApiQueryLogEvents extends ApiQueryBase {
                                $params = null;
                                break;
                        case 'block':
+                               if ( $action == 'unblock' ) {
+                                       break;
+                               }
                                $vals2 = array();
                                list( $vals2['duration'], $vals2['flags'] ) = $params;
 
                                // Indefinite blocks have no expiry time
-                               if ( Block::parseExpiryInput( $params[0] ) !== Block::infinity() ) {
+                               if ( SpecialBlock::parseExpiryInput( $params[0] ) !== wfGetDB( DB_SLAVE )->getInfinity() ) {
                                        $vals2['expiry'] = wfTimestamp( TS_ISO_8601,
                                                strtotime( $params[0], wfTimestamp( TS_UNIX, $ts ) ) );
                                }
@@ -284,8 +283,11 @@ class ApiQueryLogEvents extends ApiQueryBase {
                                $vals['actionhidden'] = '';
                        } else {
                                self::addLogParams(
-                                       $this->getResult(), $vals,
-                                       $row->log_params, $row->log_type,
+                                       $this->getResult(),
+                                       $vals,
+                                       $row->log_params,
+                                       $row->log_type,
+                                       $row->log_action,
                                        $row->log_timestamp
                                );
                        }
@@ -416,14 +418,14 @@ class ApiQueryLogEvents extends ApiQueryBase {
                                ' details        - Lists addtional details about the event',
                                ' tags           - Lists tags for the event',
                        ),
-                       'type' => 'Filter log entries to only this type(s)',
+                       'type' => 'Filter log entries to only this type',
                        'action' => "Filter log actions to only this type. Overrides {$p}type",
                        'start' => 'The timestamp to start enumerating from',
                        'end' => 'The timestamp to end enumerating',
                        'dir' => $this->getDirectionDescription( $p ),
                        'user' => 'Filter entries to those made by the given user',
                        'title' => 'Filter entries to those related to a page',
-                       'prefix' => 'Filter entries that start with this prefix. Disabled in MiserMode',
+                       'prefix' => 'Filter entries that start with this prefix. Disabled in Miser Mode',
                        'limit' => 'How many total event entries to return',
                        'tag' => 'Only list event entries tagged with this tag',
                );