Merge "mw.Upload.BookletLayout: Don't explode when the API call fails with 'exception'"

[lhc/web/wiklou.git] / includes / specials / SpecialMergeHistory.php

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index ef1fd73..0a25180 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -68,6 +68,10 @@ class SpecialMergeHistory extends SpecialPage {
                parent::__construct( 'MergeHistory', 'mergehistory' );
        }
 
+       public function doesWrites() {
+               return true;
+       }
+
        /**
         * @return void
         */
@@ -91,8 +95,8 @@ class SpecialMergeHistory extends SpecialPage {
 
                // target page
                if ( $this->mSubmitted ) {
-                       $this->mTargetObj = Title::newFromURL( $this->mTarget );
-                       $this->mDestObj = Title::newFromURL( $this->mDest );
+                       $this->mTargetObj = Title::newFromText( $this->mTarget );
+                       $this->mDestObj = Title::newFromText( $this->mDest );
                } else {
                        $this->mTargetObj = null;
                        $this->mDestObj = null;
@@ -478,7 +482,7 @@ class SpecialMergeHistory extends SpecialPage {
 
                $targetLink = Linker::link(
                        $targetTitle,
-                       $targetTitle->getPrefixedText(),
+                       null,
                        array(),
                        array( 'redirect' => 'no' )
                );