From 9b6aa05145da2d6f4598f58961f35ba4e9a0e3ba Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 16 Nov 2011 20:38:24 +0000 Subject: [PATCH] Fixed totally broken --file parameter (running the sha1 for one file) --- maintenance/populateImageSha1.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/maintenance/populateImageSha1.php b/maintenance/populateImageSha1.php index 5eec8f4449..5222c2dba7 100644 --- 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 ) { -- 2.20.1