getBools doesn't exist in Translate anymore

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

diff --git a/maintenance/deleteRevision.php b/maintenance/deleteRevision.php
index dd8bf13..ad6470d 100644 (file)
--- a/maintenance/deleteRevision.php
+++ b/maintenance/deleteRevision.php
@@ -17,27 +17,34 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script that deletes one or more revisions by moving them
+ * to the archive table.
+ *
+ * @ingroup Maintenance
+ */
 class DeleteRevision extends Maintenance {
-       
+
        public function __construct() {
                parent::__construct();
                $this->mDescription = "Delete one or more revisions by moving them to the archive table";
        }
-       
+
        public function execute() {
-               if( count( $this->mArgs ) == 0 ) {
+               if ( count( $this->mArgs ) == 0 ) {
                        $this->error( "No revisions specified", true );
                }
 
-               $this->output( "Deleting revision(s) " . implode( ',', $this->mArgs ) . 
+               $this->output( "Deleting revision(s) " . implode( ',', $this->mArgs ) .
                                                " from " . wfWikiID() . "...\n" );
                $dbw = wfGetDB( DB_MASTER );
-               
+
                $affected = 0;
                foreach ( $this->mArgs as $revID ) {
                        $dbw->insertSelect( 'archive', array( 'page', 'revision' ),
@@ -63,11 +70,11 @@ class DeleteRevision extends Maintenance {
                                $this->output( "Revision $revID not found\n" );
                        } else {
                                $affected += $dbw->affectedRows();
+                               $pageID = $dbw->selectField( 'revision', 'rev_page', array( 'rev_id' => $revID ), __METHOD__ );
+                               $pageLatest = $dbw->selectField( 'page', 'page_latest', array( 'page_id' => $pageID ), __METHOD__ );
                                $dbw->delete( 'revision', array( 'rev_id' => $revID ) );
-                               
-                               // Database integrity
-                               $pageID = $dbw->selectField( 'page', 'page_id', array( 'page_latest' => $revID ), __METHOD__ );
-                               if ( $pageID ) {
+                               if ( $pageLatest == $revID ) {
+                                       // Database integrity
                                        $newLatest = $dbw->selectField( 'revision', 'rev_id', array( 'rev_page' => $pageID ), __METHOD__, array( 'ORDER BY' => 'rev_timestamp DESC' ) );
                                        $dbw->update( 'page', array( 'page_latest' => $newLatest ), array( 'page_id' => $pageID ), __METHOD__ );
                                }
@@ -78,4 +85,4 @@ class DeleteRevision extends Maintenance {
 }
 
 $maintClass = "DeleteRevision";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );