Merge "Use Diffusion for default Git Viewer"

[lhc/web/wiklou.git] / maintenance / storage / moveToExternal.php

diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php
index 348fb77..80dc7f9 100644 (file)
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -24,8 +24,8 @@
 define( 'REPORTING_INTERVAL', 1 );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
+       $optionsWithArgs = [ 'e', 's' ];
        require_once __DIR__ . '/../commandLine.inc';
-       require_once __DIR__ . '/../../includes/externalstore/ExternalStoreDB.php';
        require_once 'resolveStubs.php';
 
        $fname = 'moveToExternal';
@@ -69,11 +69,11 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) {
                        wfWaitForSlaves();
                }
 
-               $res = $dbr->select( 'text', array( 'old_id', 'old_flags', 'old_text' ),
-                       array(
+               $res = $dbr->select( 'text', [ 'old_id', 'old_flags', 'old_text' ],
+                       [
                                "old_id BETWEEN $blockStart AND $blockEnd",
                                'old_flags NOT ' . $dbr->buildLike( $dbr->anyString(), 'external', $dbr->anyString() ),
-                       ), $fname );
+                       ], $fname );
                foreach ( $res as $row ) {
                        # Resolve stubs
                        $text = $row->old_text;
@@ -118,8 +118,8 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) {
                                exit;
                        }
                        $dbw->update( 'text',
-                               array( 'old_flags' => $flags, 'old_text' => $url ),
-                               array( 'old_id' => $id ), $fname );
+                               [ 'old_flags' => $flags, 'old_text' => $url ],
+                               [ 'old_id' => $id ], $fname );
                        $numMoved++;
                }
        }