Follow up r85467: changed some countRevisionsBetween/countAuthorsBetween callers...

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index e626335..4719612 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -833,18 +833,18 @@ CONTROL;
                        return '';
                }
 
-               $oldid = $this->mOldRev->getId();
-               $newid = $this->mNewRev->getId();
-               if ( $oldid > $newid ) {
-                       $tmp = $oldid; $oldid = $newid; $newid = $tmp;
+               if ( $this->mOldRev->getTimestamp() > $this->mNewRev->getTimestamp() ) {
+                       $oldRev = $this->mNewRev; // flip
+                       $newRev = $this->mOldRev; // flip
+               } else { // normal case
+                       $oldRev = $this->mOldRev;
+                       $newRev = $this->mNewRev;
                }
 
-               $nEdits = $this->mTitle->countRevisionsBetween( $oldid, $newid );
+               $nEdits = $this->mTitle->countRevisionsBetween( $oldRev, $newRev );
                if ( $nEdits > 0 ) {
-                       $limit = 100;
-                       // We use ($limit + 1) so we can detect if there are > 100 authors
-                       // in a given revision range. In that case, diff-multi-manyusers is used.
-                       $numUsers = $this->mTitle->countAuthorsBetween( $oldid, $newid, $limit );
+                       $limit = 100; // use diff-multi-manyusers if too many users
+                       $numUsers = $this->mTitle->countAuthorsBetween( $oldRev, $newRev, $limit );
                        return self::intermediateEditsMsg( $nEdits, $numUsers, $limit );
                }
                return ''; // nothing