Merge "Documentation: Remove paragraph about not creating a 2nd WebRequest"

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

diff --git a/maintenance/eraseArchivedFile.php b/maintenance/eraseArchivedFile.php
index 94ca604..69a95e2 100644 (file)
--- a/maintenance/eraseArchivedFile.php
+++ b/maintenance/eraseArchivedFile.php
@@ -55,7 +55,7 @@ class EraseArchivedFile extends Maintenance {
                        }
                        $afile = false;
                } else { // specified version
-                       $dbw = wfGetDB( DB_MASTER );
+                       $dbw = $this->getDB( DB_MASTER );
                        $row = $dbw->selectRow( 'filearchive', '*',
                                array( 'fa_storage_group' => 'deleted', 'fa_storage_key' => $filekey ),
                                __METHOD__ );
@@ -73,7 +73,6 @@ class EraseArchivedFile extends Maintenance {
 
                $this->output( "Purging all thumbnails for file '$filename'..." );
                $file->purgeCache();
-               $file->purgeHistory();
                $this->output( "done.\n" );
 
                if ( $afile instanceof ArchivedFile ) {
@@ -86,7 +85,7 @@ class EraseArchivedFile extends Maintenance {
        }
 
        protected function scrubAllVersions( $name ) {
-               $dbw = wfGetDB( DB_MASTER );
+               $dbw = $this->getDB( DB_MASTER );
                $res = $dbw->select( 'filearchive', '*',
                        array( 'fa_name' => $name, 'fa_storage_group' => 'deleted' ),
                        __METHOD__ );