Prepare 1.31.3

[lhc/web/wiklou.git] / maintenance / deleteAutoPatrolLogs.php

diff --git a/maintenance/deleteAutoPatrolLogs.php b/maintenance/deleteAutoPatrolLogs.php
index 3082d60..c1935a7 100644 (file)
--- a/maintenance/deleteAutoPatrolLogs.php
+++ b/maintenance/deleteAutoPatrolLogs.php
@@ -56,6 +56,8 @@ class DeleteAutoPatrolLogs extends Maintenance {
        }
 
        public function execute() {
+               $this->setBatchSize( $this->getOption( 'batch-size', $this->getBatchSize() ) );
+
                $sleep = (int)$this->getOption( 'sleep', 10 );
                $fromId = $this->getOption( 'from-id', null );
                $this->countDown( 5 );
@@ -151,7 +153,7 @@ class DeleteAutoPatrolLogs extends Maintenance {
                );
 
                $last = null;
-               $autopatrolls = [];
+               $autopatrols = [];
                foreach ( $result as $row ) {
                        $last = $row->log_id;
                        Wikimedia\suppressWarnings();
@@ -159,13 +161,13 @@ class DeleteAutoPatrolLogs extends Maintenance {
                        Wikimedia\restoreWarnings();
 
                        // Skipping really old rows, before 2011
-                       if ( is_array( $params ) && !array_key_exists( '6::auto', $params ) ) {
+                       if ( !is_array( $params ) || !array_key_exists( '6::auto', $params ) ) {
                                continue;
                        }
 
                        $auto = $params['6::auto'];
                        if ( $auto ) {
-                               $autopatrolls[] = $row->log_id;
+                               $autopatrols[] = $row->log_id;
                        }
                }
 
@@ -173,7 +175,7 @@ class DeleteAutoPatrolLogs extends Maintenance {
                        return null;
                }
 
-               return [ 'rows' => $autopatrolls, 'lastId' => $last ];
+               return [ 'rows' => $autopatrols, 'lastId' => $last ];
        }
 
        private function deleteRows( array $rows ) {