X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=maintenance%2FeraseArchivedFile.php;h=d94d49b72b46dd5699033907887ea314d048e23d;hb=c586a099d77e84549b547f8c01526ea6e9e462f0;hp=c90056db4539b6baee074697bac791d45ea85595;hpb=230b3ee879e59109af175eb0b7eba0ef7cf7e160;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/eraseArchivedFile.php b/maintenance/eraseArchivedFile.php index c90056db45..d94d49b72b 100644 --- a/maintenance/eraseArchivedFile.php +++ b/maintenance/eraseArchivedFile.php @@ -55,9 +55,10 @@ class EraseArchivedFile extends Maintenance { $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 ); } @@ -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 ) ); }