From 3cb06693a949831c545325dd1d55b3d15064a212 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 18 Nov 2010 00:08:37 +0000
Subject: [PATCH] * Moved author count check to new
 Title::countAuthorsBetween() function * Added static
 DifferenceEngine::intermediateEditsMsg() function * diff-multi msg use by
 FlaggedRevs wasn't updated after $2 param was added. Fixed this. * Minor
 cleanups to getMultiNotice()

---
 includes/Title.php                 | 23 ++++++++++++
 includes/diff/DifferenceEngine.php | 60 +++++++++++++++---------------
 2 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/includes/Title.php b/includes/Title.php
index 2eef75b06d..da282fd972 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3714,6 +3714,29 @@ class Title {
 		);
 	}
 
+	/**
+	 * Get the number of authors between the given revision IDs.
+	 * Used for diffs and other things that really need it.
+	 *
+	 * @param $fromRevId \type{\int} Revision ID (first before range)
+	 * @param $toRevId \type{\int} Revision ID (first after range)
+	 * @param $limit \type{\int} Maximum number of authors
+	 * @param $flags \type{\int} Title::GAID_FOR_UPDATE
+	 * @return \type{\int}
+	 */
+	public function countAuthorsBetween( $fromRevId, $toRevId, $limit, $flags = 0 ) {
+		$db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
+		$res = $db->select( 'revision', 'DISTINCT rev_user_text',
+			array(
+				'rev_page = ' . $this->getArticleID(),
+				'rev_id > ' . (int)$fromRevId,
+				'rev_id < ' . (int)$toRevId
+			), __METHOD__,
+			array( 'LIMIT' => $limit )
+		);
+		return (int)$db->numRows( $res );
+	}
+
 	/**
 	 * Compare with another title.
 	 *
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index d85dcfcf44..5bd845d6dc 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -798,12 +798,12 @@ CONTROL;
 
 	/**
 	 * If there are revisions between the ones being compared, return a note saying so.
+	 * @return string
 	 */
 	function getMultiNotice() {
-		if ( !is_object($this->mOldRev) || !is_object($this->mNewRev) )
-		return '';
-
-		if( !$this->mOldPage->equals( $this->mNewPage ) ) {
+		if ( !is_object( $this->mOldRev ) || !is_object( $this->mNewRev ) ) {
+			return '';
+		} elseif ( !$this->mOldPage->equals( $this->mNewPage ) ) {
 			// Comparing two different pages? Count would be meaningless.
 			return '';
 		}
@@ -814,37 +814,35 @@ CONTROL;
 			$tmp = $oldid; $oldid = $newid; $newid = $tmp;
 		}
 
-		$n = $this->mTitle->countRevisionsBetween( $oldid, $newid );
-		if ( !$n ) {
-			return '';
-		} else {
-			global $wgLang;
-			$dbr = wfGetDB( DB_SLAVE );
-			
-			// Actually, the limit is $limit + 1. We do this so we can detect
-			// if there are > 100 authors in a given revision range. If they
-			// are, $limit will be passed to diff-multi-manyusers for l10n.
+		$nEdits = $this->mTitle->countRevisionsBetween( $oldid, $newid );
+		if ( $nEdits> 0 ) {
 			$limit = 100;
-			$res = $dbr->select( 'revision', 'DISTINCT rev_user_text',
-				array(
-					'rev_page = ' . $this->mOldRev->getPage(),
-					'rev_id > ' . $this->mOldRev->getId(),
-					'rev_id < ' . $this->mNewRev->getId()
-				), __METHOD__,
-				array( 'LIMIT' => $limit + 1 )
-			);
-			$numUsers = $dbr->numRows( $res );
-			if( $numUsers > $limit ) {
-				$msg = 'diff-multi-manyusers';
-				$numUsers = $limit;
-			} else {
-				$msg = 'diff-multi';
-			}
-			return wfMsgExt( $msg, array( 'parseinline' ), $wgLang->formatnum( $n ),
-				$wgLang->formatnum( $numUsers ) );
+			// 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+1 );
+			return self::intermediateEditsMsg( $nEdits, $numUsers, $limit );
 		}
+		return ''; // nothing
 	}
 
+	/**
+	 * Get a notice about how many intermediate edits and users there are
+	 * @param $numEdits int
+	 * @param $numUsers int
+	 * @param $limit int
+	 * @return string
+	 */	
+	public static function intermediateEditsMsg( $numEdits, $numUsers, $limit ) {
+		global $wgLang;
+		if ( $numUsers > $limit ) {
+			$msg = 'diff-multi-manyusers';
+			$numUsers = $limit;
+		} else {
+			$msg = 'diff-multi';
+		}
+		return wfMsgExt( $msg, 'parseinline',
+			$wgLang->formatnum( $numEdits ), $wgLang->formatnum( $numUsers ) );
+	}
 
 	/**
 	 * Add the header to a diff body
-- 
2.20.1