Merge "Prevent page moved to different content model." into Wikidata

diff --combined includes/Title.php
index 8f18a79,f2531a2..1428f6e
--- 1/includes/Title.php
--- 2/includes/Title.php
+++ b/includes/Title.php
@@@ -3375,7 -3375,7 +3375,7 @@@ class Title 
         * @return Mixed True on success, getUserPermissionsErrors()-like array on failure
         */
        public function isValidMoveOperation( &$nt, $auth = true, $reason = '' ) {
-               global $wgUser;
+               global $wgUser, $wgContentHandlerUseDB;
  
                $errors = array();
                if ( !$nt ) {
@@@ -3408,6 -3408,15 +3408,15 @@@
                        $errors[] = array( 'badarticleerror' );
                }
  
+               // Content model checks
+               if ( !$wgContentHandlerUseDB &&
+                               $this->getContentModel() !== $nt->getContentModel() ) {
+                       // can't move a page if that would change the page's content model
+                       $errors[] = array( 'bad-target-model',
+                                                       ContentHandler::getLocalizedName( $this->getContentModel() ),
+                                                       ContentHandler::getLocalizedName( $nt->getContentModel() ) );
+               }
+ 
                // Image-specific checks
                if ( $this->getNamespace() == NS_FILE ) {
                        $errors = array_merge( $errors, $this->validateFileMoveOperation( $nt ) );
@@@ -3634,14 -3643,7 +3643,14 @@@
                        $logType = 'move';
                }
  
 -              $redirectSuppressed = !$createRedirect;
 +              if ( $createRedirect ) {
 +                      $contentHandler = ContentHandler::getForTitle( $this );
 +                      $redirectContent = $contentHandler->makeRedirectContent( $nt );
 +
 +                      // NOTE: If this page's content model does not support redirects, $redirectContent will be null.
 +              } else {
 +                      $redirectContent = null;
 +              }
  
                $logEntry = new ManualLogEntry( 'move', $logType );
                $logEntry->setPerformer( $wgUser );
@@@ -3649,7 -3651,7 +3658,7 @@@
                $logEntry->setComment( $reason );
                $logEntry->setParameters( array(
                        '4::target' => $nt->getPrefixedText(),
 -                      '5::noredir' => $redirectSuppressed ? '1': '0',
 +                      '5::noredir' => $redirectContent ? '0': '1',
                ) );
  
                $formatter = LogFormatter::newFromEntry( $logEntry );
@@@ -3711,16 -3713,18 +3720,16 @@@
                }
  
                # Recreate the redirect, this time in the other direction.
 -              if ( $redirectSuppressed ) {
 +              if ( !$redirectContent ) {
                        WikiPage::onArticleDelete( $this );
                } else {
 -                      $mwRedir = MagicWord::get( 'redirect' );
 -                      $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
                        $redirectArticle = WikiPage::factory( $this );
                        $newid = $redirectArticle->insertOn( $dbw );
                        if ( $newid ) { // sanity
                                $redirectRevision = new Revision( array(
                                        'page'    => $newid,
                                        'comment' => $comment,
 -                                      'text'    => $redirectText ) );
 +                                      'content'    => $redirectContent ) );
                                $redirectRevision->insertOn( $dbw );
                                $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );