X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FwrapOldPasswords.php;h=2534ca61dcdfefc208371350fe71ea891c63d6b2;hb=e57998f5330e8a0c9636c9075ae5fb8e3b72f913;hp=37272a018f0d3728815fdbf14b988788a71a2260;hpb=b88d4628dcde8babb4990fc4f622673e3f275650;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/wrapOldPasswords.php b/maintenance/wrapOldPasswords.php
index 37272a018f..2534ca61dc 100644
--- a/maintenance/wrapOldPasswords.php
+++ b/maintenance/wrapOldPasswords.php
@@ -32,7 +32,7 @@ require_once __DIR__ . '/Maintenance.php';
 class WrapOldPasswords extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Wrap all passwords of a certain type in a new layered type";
+		$this->addDescription( 'Wrap all passwords of a certain type in a new layered type' );
 		$this->addOption( 'type',
 			'Password type to wrap passwords in (must inherit LayeredParameterizedPassword)', true, true );
 		$this->addOption( 'verbose', 'Enables verbose output', false, false, 'v' );
@@ -72,7 +72,7 @@ class WrapOldPasswords extends Maintenance {
 
 		$minUserId = 0;
 		do {
-			$dbw->begin();
+			$this->beginTransaction( $dbw, __METHOD__ );
 
 			$res = $dbw->select( 'user',
 				array( 'user_id', 'user_name', 'user_password' ),
@@ -112,7 +112,7 @@ class WrapOldPasswords extends Maintenance {
 				$minUserId = $row->user_id;
 			}
 
-			$dbw->commit();
+			$this->commitTransaction( $dbw, __METHOD__ );
 
 			// Clear memcached so old passwords are wiped out
 			foreach ( $updateUsers as $user ) {