X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcheckUsernames.php;h=9b98721db665b90612b1349ac2220fd1b026d386;hb=beccc67e36801791acf36e33ddba034e1a34ad44;hp=e530a3bcb74a0177e8ab7602de7c50ef41795c3f;hpb=59b60fc31194b3b09bba2c95b8ddf85c3f9e81bb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php
index e530a3bcb7..9b98721db6 100644
--- a/maintenance/checkUsernames.php
+++ b/maintenance/checkUsernames.php
@@ -3,12 +3,28 @@
  * This script verifies that database usernames are actually valid.
  * An existing usernames can become invalid if User::isValidUserName()
  * is altered or if we change the $wgMaxNameChars
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Maintenance
  */
 
 
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class CheckUsernames extends Maintenance {
 
@@ -26,14 +42,14 @@ class CheckUsernames extends Maintenance {
 			__METHOD__
 		);
 
-		while ( $row = $dbr->fetchObject( $res ) ) {
+		foreach ( $res as $row ) {
 			if ( ! User::isValidUserName( $row->user_name ) ) {
 				$this->error( sprintf( "%s: %6d: '%s'\n", wfWikiID(), $row->user_id, $row->user_name ) );
-				wfDebugLog( 'checkUsernames', $out );
+				wfDebugLog( 'checkUsernames', $row->user_name );
 			}
 		}
 	}
 }
 
 $maintClass = "CheckUsernames";
-require_once( "doMaintenance.php" );
+require_once( RUN_MAINTENANCE_IF_MAIN );