Merge "(bug 40857) fix non-array sidebar links handling in CologneBlue"

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

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index 20de17e..a91abf9 100644 (file)
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -17,13 +17,20 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  * @author Rob Church <robchur@gmail.com>
  * @licence GNU General Public Licence 2.0 or later
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script that reassigns edits from a user or IP address
+ * to another user.
+ *
+ * @ingroup Maintenance
+ */
 class ReassignEdits extends Maintenance {
        public function __construct() {
                parent::__construct();
@@ -62,13 +69,13 @@ class ReassignEdits extends Maintenance {
         *
         * @param $from User to take edits from
         * @param $to User to assign edits to
-        * @param $rc Update the recent changes table
-        * @param $report Don't change things; just echo numbers
+        * @param $rc bool Update the recent changes table
+        * @param $report bool Don't change things; just echo numbers
         * @return integer Number of entries changed, or that would be changed
         */
        private function doReassignEdits( &$from, &$to, $rc = false, $report = false ) {
                $dbw = wfGetDB( DB_MASTER );
-               $dbw->begin();
+               $dbw->begin( __METHOD__ );
 
                # Count things
                $this->output( "Checking current edits..." );
@@ -117,7 +124,7 @@ class ReassignEdits extends Maintenance {
                        }
                }
 
-               $dbw->commit();
+               $dbw->commit( __METHOD__ );
                return (int)$total;
        }
 
@@ -150,7 +157,7 @@ class ReassignEdits extends Maintenance {
        /**
         * Initialise the user object
         *
-        * @param $username Username or IP address
+        * @param $username string Username or IP address
         * @return User
         */
        private function initialiseUser( $username ) {
@@ -160,6 +167,9 @@ class ReassignEdits extends Maintenance {
                        $user->setName( $username );
                } else {
                        $user = User::newFromName( $username );
+                       if ( !$user ) {
+                               $this->error( "Invalid username", true );
+                       }
                }
                $user->load();
                return $user;