X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FdeleteRevision.php;h=4606d927fe03d04df1e23ff52f36237b34e94f8c;hb=5d97e895562ec09d9233e199c21f5af7c6d58c9f;hp=6bc0f7cd01230b0703371979ec87e5836317f420;hpb=703206f38c63ba51e75a8aa49724f112ab78047d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/deleteRevision.php b/maintenance/deleteRevision.php
index 6bc0f7cd01..4606d927fe 100644
--- a/maintenance/deleteRevision.php
+++ b/maintenance/deleteRevision.php
@@ -33,7 +33,7 @@ class DeleteRevision extends Maintenance {
 
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Delete one or more revisions by moving them to the archive table";
+		$this->addDescription( 'Delete one or more revisions by moving them to the archive table' );
 	}
 
 	public function execute() {
@@ -42,41 +42,64 @@ class DeleteRevision extends Maintenance {
 		}
 
 		$this->output( "Deleting revision(s) " . implode( ',', $this->mArgs ) .
-						" from " . wfWikiID() . "...\n" );
-		$dbw = wfGetDB( DB_MASTER );
+			" from " . wfWikiID() . "...\n" );
+		$dbw = $this->getDB( DB_MASTER );
 
 		$affected = 0;
 		foreach ( $this->mArgs as $revID ) {
 			$dbw->insertSelect( 'archive', array( 'page', 'revision' ),
 				array(
-					'ar_namespace'  => 'page_namespace',
-					'ar_title'      => 'page_title',
-					'ar_page_id'    => 'page_id',
-					'ar_comment'    => 'rev_comment',
-					'ar_user'       => 'rev_user',
-					'ar_user_text'  => 'rev_user_text',
-					'ar_timestamp'  => 'rev_timestamp',
+					'ar_namespace' => 'page_namespace',
+					'ar_title' => 'page_title',
+					'ar_page_id' => 'page_id',
+					'ar_comment' => 'rev_comment',
+					'ar_user' => 'rev_user',
+					'ar_user_text' => 'rev_user_text',
+					'ar_timestamp' => 'rev_timestamp',
 					'ar_minor_edit' => 'rev_minor_edit',
-					'ar_rev_id'     => 'rev_id',
-					'ar_text_id'    => 'rev_text_id',
-					'ar_deleted'    => 'rev_deleted',
-					'ar_len'        => 'rev_len',
-				), array(
+					'ar_rev_id' => 'rev_id',
+					'ar_text_id' => 'rev_text_id',
+					'ar_deleted' => 'rev_deleted',
+					'ar_len' => 'rev_len',
+				),
+				array(
 					'rev_id' => $revID,
 					'page_id = rev_page'
-				), __METHOD__
+				),
+				__METHOD__
 			);
 			if ( !$dbw->affectedRows() ) {
 				$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__ );
+				$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 ) );
 				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__ );
+					$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__
+					);
 				}
 			}
 		}