Localisation updates for core and extension messages from translatewiki.net

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

diff --git a/maintenance/populateImageSha1.php b/maintenance/populateImageSha1.php
index 90fe82c..5222c2d 100644 (file)
--- a/maintenance/populateImageSha1.php
+++ b/maintenance/populateImageSha1.php
@@ -39,6 +39,14 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance {
                return 'img_sha1 column of image table already populated.';
        }
 
+       public function execute() {
+               if ( $this->getOption( 'file' ) ) {
+                       $this->doDBUpdates(); // skip update log checks/saves
+               } else {
+                       parent::execute();
+               }
+       }
+
        public function doDBUpdates() {
                $method = $this->getOption( 'method', 'normal' );
                $file = $this->getOption( 'file' );
@@ -46,10 +54,10 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance {
                $t = -microtime( true );
                $dbw = wfGetDB( DB_MASTER );
                if ( $file ) {
-                       $res = $dbw->selectRow(
+                       $res = $dbw->select(
                                'image',
                                array( 'img_name' ),
-                               array( 'img_name' => $dbw->addQuotes( $file ) ),
+                               array( 'img_name' => $file ),
                                __METHOD__
                        );
                        if ( !$res ) {
@@ -105,11 +113,7 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance {
                $t += microtime( true );
                $this->output( sprintf( "\nDone %d files in %.1f seconds\n", $numRows, $t ) );
 
-               if ( $file ) {
-                       return false; // we only updated *some* files, don't log
-               } else {
-                       return true;
-               }
+               return !$file; // we only updated *some* files, don't log
        }
 }