X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMovePage.php;h=2ad315811c9e10a01edf960d1bdaa26b807c7b29;hb=1f417912730a72f07d189231fb9dee40c5869bef;hp=614ea7daa5457f83a8f3f76f8b43bdff0fb315fe;hpb=ea34d2cbde6195ebc3b4c01a113b774c0fdf54ea;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MovePage.php b/includes/MovePage.php
index 614ea7daa5..2ad315811c 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -280,13 +280,7 @@ class MovePage {
 			[ 'cl_from' => $pageid ],
 			__METHOD__
 		);
-		if ( $this->newTitle->getNamespace() == NS_CATEGORY ) {
-			$type = 'subcat';
-		} elseif ( $this->newTitle->getNamespace() == NS_FILE ) {
-			$type = 'file';
-		} else {
-			$type = 'page';
-		}
+		$type = MWNamespace::getCategoryLinkType( $this->newTitle->getNamespace() );
 		foreach ( $prefixes as $prefixRow ) {
 			$prefix = $prefixRow->cl_sortkey_prefix;
 			$catTo = $prefixRow->cl_to;
@@ -529,15 +523,6 @@ class MovePage {
 
 		$newpage = WikiPage::factory( $nt );
 
-		# Save a null revision in the page's history notifying of the move
-		$nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true, $user );
-		if ( !is_object( $nullRevision ) ) {
-			throw new MWException( 'No valid null revision produced in ' . __METHOD__ );
-		}
-
-		$nullRevId = $nullRevision->insertOn( $dbw );
-		$logEntry->setAssociatedRevId( $nullRevId );
-
 		# Change the name of the target page:
 		$dbw->update( 'page',
 			/* SET */ [
@@ -548,6 +533,15 @@ class MovePage {
 			__METHOD__
 		);
 
+		# Save a null revision in the page's history notifying of the move
+		$nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true, $user );
+		if ( !is_object( $nullRevision ) ) {
+			throw new MWException( 'No valid null revision produced in ' . __METHOD__ );
+		}
+
+		$nullRevId = $nullRevision->insertOn( $dbw );
+		$logEntry->setAssociatedRevId( $nullRevId );
+
 		if ( !$redirectContent ) {
 			// Clean up the old title *before* reset article id - T47348
 			WikiPage::onArticleDelete( $this->oldTitle );