From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Fri, 23 May 2008 21:31:39 +0000 (+0000)
Subject: Fix another bug pointed out by Brion, pseudo-subpages can get moved.
X-Git-Tag: 1.31.0-rc.0~47425
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/fiche.php?a=commitdiff_plain;h=42b14d0442e4ba35c11035e55ab5b0aadf8d5e6a;p=lhc%2Fweb%2Fwiklou.git

Fix another bug pointed out by Brion, pseudo-subpages can get moved.
---

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index e98f6e5bce..9207113591 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -326,11 +326,12 @@ class MovePageForm {
 				'page_title LIKE '.$dbr->addQuotes( $dbr->escapeLike( $ot->getDBkey() ) . '/%' )
 					.' OR page_title = ' . $dbr->addQuotes( $ot->getDBkey() )
 			);
+			$conds['page_namespace'] = array();
+			if( !empty( $wgNamespacesWithSubpages[$nt->getNamespace()] ) ) {
+				$conds['page_namespace'] []= $ot->getNamespace();
+			}
 			if( $this->moveTalk && !empty( $wgNamespacesWithSubpages[$nt->getTalkPage()->getNamespace()] ) ) {
-				$conds['page_namespace'] = array( $ot->getNamespace(),
-					MWNamespace::getTalk($ot->getNamespace()) );
-			} else {
-				$conds['page_namespace'] = $ot->getNamespace();
+				$conds['page_namespace'] []= $ot->getTalkPage()->getNamespace();
 			}
 		} elseif( $this->moveTalk ) {
 			$conds = array(