From: Jens Frank <jeluf@users.mediawiki.org>
Date: Tue, 18 May 2010 19:39:34 +0000 (+0000)
Subject: Move talk pages, too, cf. bug #23409
X-Git-Tag: 1.31.0-rc.0~36800
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=de138cea7c6b63d93433d415863ad097e665cead;p=lhc%2Fweb%2Fwiklou.git

Move talk pages, too, cf. bug #23409
---

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index dd29558cd1..dee2d28122 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -199,10 +199,10 @@ class NamespaceConflictChecker extends Maintenance {
                                      
 		$sql = "SELECT {$page}_id    AS id,
 		               {$page}_title AS oldtitle,
-		               $encNamespace AS namespace,
+		               $encNamespace + {$page}_namespace AS namespace,
 		               $titleSql     AS title
 		          FROM {$table}
-		         WHERE {$page}_namespace=0
+		         WHERE ( {$page}_namespace=0 OR {$page}_namespace=1 )
 		           AND {$page}_title " . $this->db->buildLike( $name . ':', $this->db->anyString() );
 
 		$result = $this->db->query( $sql, __METHOD__ );