From 3dba8c10d54e8ac74ffa10d05bed0a16ef92ee04 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 20 Mar 2009 02:58:18 +0000 Subject: [PATCH] Tweaked r48158 to show error in more cases --- includes/specials/SpecialMergeHistory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' ) ); } -- 2.20.1