Tweaked r48158 to show error in more cases

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 300157e..c51ce7c 100644 (file)
--- 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' ) );
                }