X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FconvertUserOptions.php;h=d39b040c62ac599c1fbad44ac772a058f1f2c8eb;hb=709c614382c199b7d3c5fc5bdbd285d8d3a5f339;hp=e666b65a13f1729a02c0657070e7bba7feff9f04;hpb=bf99725d8db8e842be3d920be43726425e26631e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index e666b65a13..d39b040c62 100644
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to convert user options to the new `user_properties` table.
@@ -56,7 +56,7 @@ class ConvertUserOptions extends Maintenance {
 				array( 'LIMIT' => 50, 'FOR UPDATE' )
 			);
 			$id = $this->convertOptionBatch( $res, $dbw );
-			$dbw->commit();
+			$dbw->commit( __METHOD__ );
 
 			wfWaitForSlaves();
 
@@ -96,4 +96,4 @@ class ConvertUserOptions extends Maintenance {
 }
 
 $maintClass = "ConvertUserOptions";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;