From: Rob Church <robchurch@users.mediawiki.org>
Date: Thu, 26 Jan 2006 18:07:34 +0000 (+0000)
Subject: Include deleted edits in the CountEdits support function; will affect removeUnusedAcc... 
X-Git-Tag: 1.6.0~418
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=5719d1598673e84d92a8f22f753d9f9540bafb4a;p=lhc%2Fweb%2Fwiklou.git

Include deleted edits in the CountEdits support function; will affect removeUnusedAccounts script
---

diff --git a/maintenance/userFunctions.inc b/maintenance/userFunctions.inc
index c635de5591..42429e86f2 100644
--- a/maintenance/userFunctions.inc
+++ b/maintenance/userFunctions.inc
@@ -17,9 +17,16 @@
  */
 function CountEdits( $user, $slave = true ) {
 	$dbw =& wfGetDB( $slave ? DB_SLAVE: DB_MASTER );
+	# Count current edits
 	$res = $dbw->select( 'revision', 'COUNT(rev_id) AS count', array( 'rev_user' => $user ) );
 	$row = $dbw->fetchObject( $res );
-	return( $row->count );
+	$count = $row->count;
+	# Count deleted edits
+	$res = $dbw->select( 'archive', 'COUNT(*) AS count', array( 'ar_user' => $user ) );
+	$row = $dbw->fetchObject( $res );
+	$count += $row->count;
+	# Done
+	return( $count );
 }
 
 /**