[Fusionforge-commits] FusionForge branch master updated. 6.0.4-818-g7ef7155

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Aug 31 17:57:15 CEST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  7ef71557288604ecd004a70928b1c2a50bf642a7 (commit)
      from  a30ac4364d8472c30b1ce201e6c5ff7c95913064 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7ef71557288604ecd004a70928b1c2a50bf642a7

commit 7ef71557288604ecd004a70928b1c2a50bf642a7
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Aug 31 17:57:09 2016 +0200

    fix getActivityLogs: use only active Group

diff --git a/src/common/include/User.class.php b/src/common/include/User.class.php
index 46fccba..6dccd95 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -1807,8 +1807,9 @@ Email: %3$s
 	}
 
 	function getActivityLogGroups() {
-		$res = db_query_params('select group_id from activity_log where group_id != 0 and user_id = $1 group by group_id order by count(group_id) desc',
-					array($this->getID()), 5);
+		$res = db_query_params('select activity_log.group_id from activity_log, groups where activity_log.group_id != 0 and user_id = $1 and groups.status = $2 group by activity_log.group_id order by count(activity_log.group_id) desc',
+					array($this->getID()), 'A', 5);
+
 		if (!$res) {
 			return array();
 		} else {

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/User.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list