Merge "Make OutputPage's mechanism for gathering Vary headers reusable"

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

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index 2bf68dd..ffbdb2b 100644 (file)
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -44,7 +44,7 @@ class UpdateRestrictions extends Maintenance {
                        $this->error( "Nothing to do.", true );
                }
                $end = $db->selectField( 'page', 'MAX(page_id)', false, __METHOD__ );
-       
+
                # Do remaining chunk
                $end += $this->mBatchSize - 1;
                $blockStart = $start;
@@ -64,7 +64,7 @@ class UpdateRestrictions extends Maintenance {
                                                // old old format should be treated as edit/move restriction
                                                $oldRestrictions["edit"] = trim( $temp[0] );
                                                $oldRestrictions["move"] = trim( $temp[0] );
-                                       } else if ( $temp[1] ) {
+                                       } elseif ( $temp[1] ) {
                                                $oldRestrictions[$temp[0]] = trim( $temp[1] );
                                        }
                                }
@@ -96,7 +96,7 @@ class UpdateRestrictions extends Maintenance {
                        }
                        $blockStart += $this->mBatchSize - 1;
                        $blockEnd += $this->mBatchSize - 1;
-                       wfWaitForSlaves( 5 );
+                       wfWaitForSlaves();
                }
                $this->output( "...removing dead rows from page_restrictions\n" );
                // Kill any broken rows from previous imports
@@ -108,4 +108,4 @@ class UpdateRestrictions extends Maintenance {
 }
 
 $maintClass = "UpdateRestrictions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );