Revision: 48619
Author: aaron
Date: 2009-03-20 02:58:18 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Tweaked r48158 to show error in more cases
Modified Paths:
--------------
trunk/phase3/includes/specials/SpecialMergeHistory.php
Modified: trunk/phase3/includes/specials/SpecialMergeHistory.php
===================================================================
--- trunk/phase3/includes/specials/SpecialMergeHistory.php 2009-03-20
01:58:25 UTC (rev 48618)
+++ trunk/phase3/includes/specials/SpecialMergeHistory.php 2009-03-20
02:58:18 UTC (rev 48619)
@@ -97,7 +97,7 @@
);
}
- 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' ) );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
