X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FnamespaceDupes.php;h=5fc972c3a7718c6d35dd069c40ae07aa7184320e;hb=cbf4776dc862e245d947f77b29e9c5b687af7159;hp=ff024682c6a5563501800e6d2bb61742eba33a64;hpb=f0a00a49b1be46b51aeef712f363305bce4448fa;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index ff024682c6..5fc972c3a7 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -3,7 +3,7 @@
  * Check for articles to fix after adding/deleting namespaces
  *
  * Copyright © 2005-2007 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
@@ -50,10 +50,7 @@ class NamespaceConflictChecker extends Maintenance {
 	}
 
 	public function execute() {
-		global $wgTitle;
-
 		$this->db = wfGetDB( DB_MASTER );
-		$wgTitle = Title::newFromText( 'Namespace title conflict cleanup script' );
 
 		$fix = $this->hasOption( 'fix' );
 		$suffix = $this->getOption( 'suffix', '' );
@@ -75,8 +72,8 @@ class NamespaceConflictChecker extends Maintenance {
 
 	/**
 	 * @todo Document
-	 * @param $fix Boolean: whether or not to fix broken entries
-	 * @param $suffix String: suffix to append to renamed articles
+	 * @param bool $fix Whether or not to fix broken entries
+	 * @param string $suffix Suffix to append to renamed articles
 	 *
 	 * @return bool
 	 */
@@ -147,7 +144,7 @@ class NamespaceConflictChecker extends Maintenance {
 	/**
 	 * Get the interwiki list
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	private function getInterwikiList() {
 		$result = Interwiki::getAllPrefixes();
@@ -160,10 +157,10 @@ class NamespaceConflictChecker extends Maintenance {
 
 	/**
 	 * @todo Document
-	 * @param $ns Integer: a namespace id
-	 * @param $name String
-	 * @param $fix Boolean: whether to fix broken entries
-	 * @param $suffix String: suffix to append to renamed articles
+	 * @param int $ns A namespace id
+	 * @param string $name
+	 * @param bool $fix Whether to fix broken entries
+	 * @param string $suffix Suffix to append to renamed articles
 	 * @return bool
 	 */
 	private function checkNamespace( $ns, $name, $fix, $suffix = '' ) {
@@ -186,10 +183,10 @@ class NamespaceConflictChecker extends Maintenance {
 
 	/**
 	 * @todo Do this for real
-	 * @param $key
-	 * @param $prefix
-	 * @param $fix
-	 * @param $suffix string
+	 * @param int $ns
+	 * @param string $name
+	 * @param bool $fix
+	 * @param string $suffix
 	 * @return bool
 	 */
 	private function checkPrefix( $key, $prefix, $fix, $suffix = '' ) {
@@ -201,8 +198,8 @@ class NamespaceConflictChecker extends Maintenance {
 	 * Find pages in mainspace that have a prefix of the new namespace
 	 * so we know titles that will need migrating
 	 *
-	 * @param $ns Integer: namespace id (id for new namespace?)
-	 * @param $name String: prefix that is being made a namespace
+	 * @param int $ns Namespace id (id for new namespace?)
+	 * @param string $name Prefix that is being made a namespace
 	 *
 	 * @return array
 	 */
@@ -240,6 +237,8 @@ class NamespaceConflictChecker extends Maintenance {
 	/**
 	 * Report any conflicts we find
 	 *
+	 * @param stdClass $row
+	 * @param string $suffix
 	 * @return bool
 	 */
 	private function reportConflict( $row, $suffix ) {
@@ -275,9 +274,9 @@ class NamespaceConflictChecker extends Maintenance {
 	/**
 	 * Resolve any conflicts
 	 *
-	 * @param $row Object: row from the page table to fix
-	 * @param $resolvable Boolean
-	 * @param $suffix String: suffix to append to the fixed page
+	 * @param stClass $row Row from the page table to fix
+	 * @param bool $resolvable
+	 * @param string $suffix Suffix to append to the fixed page
 	 * @return bool
 	 */
 	private function resolveConflict( $row, $resolvable, $suffix ) {
@@ -307,9 +306,9 @@ class NamespaceConflictChecker extends Maintenance {
 	/**
 	 * Resolve a given conflict
 	 *
-	 * @param $row Object: row from the old broken entry
-	 * @param $table String: table to update
-	 * @param $prefix String: prefix for column name, like page or ar
+	 * @param stdClass $row Row from the old broken entry
+	 * @param string $table Table to update
+	 * @param string $prefix Prefix for column name, like page or ar
 	 * @return bool
 	 */
 	private function resolveConflictOn( $row, $table, $prefix ) {