X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcleanupCaps.php;h=6234db48cacf118cc0adc5d1827277ae2ed44227;hb=6fcd6ad4b56b487202dfa5f0b0273e009889c9c3;hp=1a47ac4e52098ad0f86a5d33184efb6e45335363;hpb=5c5fb511c70346a660cb6aa388cc677e11d3bdab;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupCaps.php b/maintenance/cleanupCaps.php
index 1a47ac4e52..6234db48ca 100644
--- a/maintenance/cleanupCaps.php
+++ b/maintenance/cleanupCaps.php
@@ -7,7 +7,7 @@
  *   --dry-run  don't actually try moving them
  *
  * Copyright © 2005 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
  *
  * 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
@@ -37,6 +37,9 @@ require_once __DIR__ . '/cleanupTable.inc';
  * @ingroup Maintenance
  */
 class CapsCleanup extends TableCleanup {
+
+	private $user;
+
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Script to cleanup capitalization";
@@ -44,13 +47,13 @@ class CapsCleanup extends TableCleanup {
 	}
 
 	public function execute() {
-		global $wgCapitalLinks, $wgUser;
+		global $wgCapitalLinks;
 
 		if ( $wgCapitalLinks ) {
 			$this->error( "\$wgCapitalLinks is on -- no need for caps links cleanup.", true );
 		}
 
-		$wgUser = User::newFromName( 'Conversion script' );
+		$this->user = User::newFromName( 'Conversion script' );
 
 		$this->namespace = intval( $this->getOption( 'namespace', 0 ) );
 		$this->dryrun = $this->hasOption( 'dry-run' );
@@ -71,6 +74,7 @@ class CapsCleanup extends TableCleanup {
 		$lower = $wgContLang->lcfirst( $row->page_title );
 		if ( $upper == $lower ) {
 			$this->output( "\"$display\" already lowercase.\n" );
+
 			return $this->progress( 0 );
 		}
 
@@ -78,6 +82,7 @@ class CapsCleanup extends TableCleanup {
 		$targetDisplay = $target->getPrefixedText();
 		if ( $target->exists() ) {
 			$this->output( "\"$display\" skipped; \"$targetDisplay\" already exists\n" );
+
 			return $this->progress( 0 );
 		}
 
@@ -85,7 +90,9 @@ class CapsCleanup extends TableCleanup {
 			$this->output( "\"$display\" -> \"$targetDisplay\": DRY RUN, NOT MOVED\n" );
 			$ok = true;
 		} else {
-			$ok = $current->moveTo( $target, false, 'Converting page titles to lowercase' );
+			$mp = new MovePage( $current, $target );
+			$status = $mp->move( $this->user, 'Converting page titles to lowercase', true );
+			$ok = $status->isOK() ? 'OK' : $status->getWikiText();
 			$this->output( "\"$display\" -> \"$targetDisplay\": $ok\n" );
 		}
 		if ( $ok === true ) {
@@ -98,6 +105,7 @@ class CapsCleanup extends TableCleanup {
 				}
 			}
 		}
+
 		return $this->progress( 0 );
 	}
 }