dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Display MAX_CHARS / MAX_BYTES in ApiSandbox"
[lhc/web/wiklou.git]
/
maintenance
/
eraseArchivedFile.php
diff --git
a/maintenance/eraseArchivedFile.php
b/maintenance/eraseArchivedFile.php
index
c90056d
..
d94d49b
100644
(file)
--- 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 );
$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 ],
[ 'fa_storage_group' => 'deleted', 'fa_storage_key' => $filekey ],
- __METHOD__ );
+ __METHOD__
, [], $fileQuery['joins']
);
if ( !$row ) {
$this->error( "No deleted file exists with key '$filekey'.", 1 );
}
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 );
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' ],
[ 'fa_name' => $name, 'fa_storage_group' => 'deleted' ],
- __METHOD__ );
+ __METHOD__
, [], $fileQuery['joins']
);
foreach ( $res as $row ) {
$this->scrubVersion( ArchivedFile::newFromRow( $row ) );
}
foreach ( $res as $row ) {
$this->scrubVersion( ArchivedFile::newFromRow( $row ) );
}