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 5dffc618c598c25f1489be2bcd9b0caa353ccda1 (commit)
from b8cd741dc090f4249a0a16971e2c73ca2db67846 (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=5dffc618c598c25f1489be2bcd9b0caa353ccda1
commit 5dffc618c598c25f1489be2bcd9b0caa353ccda1
Author: Franck Villaume <[email protected]>
Date: Sun Apr 18 10:24:10 2021 +0200
fix getNumberOfProjects call: require array
diff --git a/src/common/include/FusionForge.class.php
b/src/common/include/FusionForge.class.php
index 88cd8a3..414b151 100644
--- a/src/common/include/FusionForge.class.php
+++ b/src/common/include/FusionForge.class.php
@@ -64,7 +64,7 @@ class FusionForge extends FFError {
*/
function getNumberOfProjects($params = array(), $extended_qpa = null) {
$qpa = db_construct_qpa(false, 'SELECT count(*) AS count FROM
groups');
- if (count($params) > 1) {
+ if (is_array($params) && count($params) > 1) {
$qpa = db_construct_qpa($qpa, ' WHERE ');
$i = 0;
foreach ($params as $key => $value) {
diff --git a/src/www/admin/grouplist.php b/src/www/admin/grouplist.php
index f2dddb3..48d6ff6 100644
--- a/src/www/admin/grouplist.php
+++ b/src/www/admin/grouplist.php
@@ -96,7 +96,7 @@ if ($usingplugin) {
$qpa = db_construct_qpa($qpa, ' GROUP BY
group_name,register_time,unix_group_name,groups.group_id,groups.is_template,status,license_name
ORDER BY '.$sqlsortorder);
$qpa = db_construct_qpa($qpa, ' OFFSET $1 LIMIT $2', array($start,
$paging));
$res = db_query_qpa($qpa);
- $totalProjects =
FusionForge::getInstance()->getNumberOfProjects($status);
+ $totalProjects =
FusionForge::getInstance()->getNumberOfProjects(array($status));
}
$rows = array();
-----------------------------------------------------------------------
Summary of changes:
src/common/include/FusionForge.class.php | 2 +-
src/www/admin/grouplist.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
