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, 6.1 has been updated
via becc218b1876f7a11f2d3fdfa8a52564c47237da (commit)
from d9219073e0eea546c66307043601e2667290b137 (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=becc218b1876f7a11f2d3fdfa8a52564c47237da
commit becc218b1876f7a11f2d3fdfa8a52564c47237da
Author: Franck Villaume <[email protected]>
Date: Thu Dec 28 20:14:34 2017 +0100
docman: fix DocumentManager getActivity. do not reset the query in case of
multiple sections
diff --git a/src/common/docman/DocumentManager.class.php
b/src/common/docman/DocumentManager.class.php
index d4680b4..d9dac55 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -433,13 +433,14 @@ class DocumentManager extends FFError {
*/
function getActivity($sections, $begin, $end) {
$results = array();
+ $qpa = false;
for ($i = 0; $i < count($sections); $i++) {
$results[$sections[$i]] = 0;
$union = 0;
if (count($sections) >= 1 && $i != count($sections) -1)
{
$union = 1;
}
- $qpa = db_construct_qpa(false, 'SELECT count(*) FROM
activity_vw WHERE activity_date BETWEEN $1 AND $2
+ $qpa = db_construct_qpa($qpa, 'SELECT count(*) FROM
activity_vw WHERE activity_date BETWEEN $1 AND $2
AND group_id = $3 AND
section = $4 ',
array($begin,
$end,
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentManager.class.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
