X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FeraseArchivedFile.php;h=24ef1ed6f67634f39fb235bfaeca544d0b8bf8d9;hb=99e0e6790295a17e081faf98f35cf08144568cf0;hp=c90056db4539b6baee074697bac791d45ea85595;hpb=0e25b050286bed143ed5a23e87d5543fe71ce5dd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/eraseArchivedFile.php b/maintenance/eraseArchivedFile.php
index c90056db45..24ef1ed6f6 100644
--- a/maintenance/eraseArchivedFile.php
+++ b/maintenance/eraseArchivedFile.php
@@ -50,16 +50,17 @@ class EraseArchivedFile extends Maintenance {
 
 		if ( $filekey === '*' ) { // all versions by name
 			if ( !strlen( $filename ) ) {
-				$this->error( "Missing --filename parameter.", 1 );
+				$this->fatalError( "Missing --filename parameter." );
 			}
 			$afile = false;
 		} else { // specified version
 			$dbw = $this->getDB( DB_MASTER );
-			$row = $dbw->selectRow( 'filearchive', '*',
+			$fileQuery = ArchivedFile::getQueryInfo();
+			$row = $dbw->selectRow( $fileQuery['tables'], $fileQuery['fields'],
 				[ 'fa_storage_group' => 'deleted', 'fa_storage_key' => $filekey ],
-				__METHOD__ );
+				__METHOD__, [], $fileQuery['joins'] );
 			if ( !$row ) {
-				$this->error( "No deleted file exists with key '$filekey'.", 1 );
+				$this->fatalError( "No deleted file exists with key '$filekey'." );
 			}
 			$filename = $row->fa_name;
 			$afile = ArchivedFile::newFromRow( $row );
@@ -67,7 +68,7 @@ class EraseArchivedFile extends Maintenance {
 
 		$file = wfLocalFile( $filename );
 		if ( $file->exists() ) {
-			$this->error( "File '$filename' is still a public file, use the delete form.\n", 1 );
+			$this->fatalError( "File '$filename' is still a public file, use the delete form.\n" );
 		}
 
 		$this->output( "Purging all thumbnails for file '$filename'..." );
@@ -85,9 +86,10 @@ class EraseArchivedFile extends Maintenance {
 
 	protected function scrubAllVersions( $name ) {
 		$dbw = $this->getDB( DB_MASTER );
-		$res = $dbw->select( 'filearchive', '*',
+		$fileQuery = ArchivedFile::getQueryInfo();
+		$res = $dbw->select( $fileQuery['tables'], $fileQuery['fields'],
 			[ 'fa_name' => $name, 'fa_storage_group' => 'deleted' ],
-			__METHOD__ );
+			__METHOD__, [], $fileQuery['joins'] );
 		foreach ( $res as $row ) {
 			$this->scrubVersion( ArchivedFile::newFromRow( $row ) );
 		}