From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 8 Mar 2009 06:57:39 +0000 (+0000)
Subject: Fix fatal
X-Git-Tag: 1.31.0-rc.0~42572
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=7cb9bcb9ac5bac627329a19922ddadbc1c97c04b;p=lhc%2Fweb%2Fwiklou.git

Fix fatal
---

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 53bae84689..3ba72ef8f3 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -97,7 +97,7 @@ class MergehistoryForm {
 			);
 		}
 		
-		if ( $this->mTargetObj->equals( $this->mDestObj ) ) {
+		if ( empty($errors) && $this->mTargetObj->equals( $this->mDestObj ) ) {
 			$errors[] = wfMsgExt( 'mergehistory-same-destination', array( 'parse' ) );
 		}