From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 20 Mar 2009 02:58:18 +0000 (+0000)
Subject: Tweaked r48158 to show error in more cases
X-Git-Tag: 1.31.0-rc.0~42441
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=3dba8c10d54e8ac74ffa10d05bed0a16ef92ee04;p=lhc%2Fweb%2Fwiklou.git

Tweaked r48158 to show error in more cases
---

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