Fix undefined $modelId in MWUnknownContentModelException

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

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index b1bb353..f67739b 100644 (file)
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -51,14 +51,14 @@ class ImageBuilder extends Maintenance {
                // make sure to update old, but compatible img_metadata fields.
                $wgUpdateCompatibleMetadata = true;
 
-               $this->mDescription = 'Script to update image metadata records';
+               $this->addDescription( 'Script to update image metadata records' );
 
                $this->addOption( 'missing', 'Check for files without associated database record' );
                $this->addOption( 'dry-run', 'Only report, don\'t update the database' );
        }
 
        public function execute() {
-               $this->dbw = wfGetDB( DB_MASTER );
+               $this->dbw = $this->getDB( DB_MASTER );
                $this->dryrun = $this->hasOption( 'dry-run' );
                if ( $this->dryrun ) {
                        $GLOBALS['wgReadOnly'] = 'Dry run mode, image upgrades are suppressed';
@@ -127,7 +127,7 @@ class ImageBuilder extends Maintenance {
                $this->init( $count, $table );
                $this->output( "Processing $table...\n" );
 
-               $result = wfGetDB( DB_SLAVE )->select( $table, '*', array(), __METHOD__ );
+               $result = $this->getDB( DB_SLAVE )->select( $table, '*', [], __METHOD__ );
 
                foreach ( $result as $row ) {
                        $update = call_user_func( $callback, $row, null );
@@ -141,7 +141,7 @@ class ImageBuilder extends Maintenance {
        }
 
        function buildImage() {
-               $callback = array( $this, 'imageCallback' );
+               $callback = [ $this, 'imageCallback' ];
                $this->buildTable( 'image', 'img_name', $callback );
        }
 
@@ -154,7 +154,7 @@ class ImageBuilder extends Maintenance {
        }
 
        function buildOldImage() {
-               $this->buildTable( 'oldimage', 'oi_archive_name', array( $this, 'oldimageCallback' ) );
+               $this->buildTable( 'oldimage', 'oi_archive_name', [ $this, 'oldimageCallback' ] );
        }
 
        function oldimageCallback( $row, $copy ) {
@@ -171,14 +171,14 @@ class ImageBuilder extends Maintenance {
        }
 
        function crawlMissing() {
-               $this->getRepo()->enumFiles( array( $this, 'checkMissingImage' ) );
+               $this->getRepo()->enumFiles( [ $this, 'checkMissingImage' ] );
        }
 
        function checkMissingImage( $fullpath ) {
                $filename = wfBaseName( $fullpath );
                $row = $this->dbw->selectRow( 'image',
-                       array( 'img_name' ),
-                       array( 'img_name' => $filename ),
+                       [ 'img_name' ],
+                       [ 'img_name' => $filename ],
                        __METHOD__ );
 
                if ( !$row ) { // file not registered