[Fusionforge-commits] r11185 - in trunk/src: common/include www/admin
Roland Mas
lolando at libremir.placard.fr.eu.org
Mon Oct 25 21:26:40 CEST 2010
Author: lolando
Date: 2010-10-25 21:26:39 +0200 (Mon, 25 Oct 2010)
New Revision: 11185
Modified:
trunk/src/common/include/GroupJoinRequest.class.php
trunk/src/www/admin/approve-pending.php
Log:
Fixed PHP?\194?\160notices
Modified: trunk/src/common/include/GroupJoinRequest.class.php
===================================================================
--- trunk/src/common/include/GroupJoinRequest.class.php 2010-10-25 17:20:04 UTC (rev 11184)
+++ trunk/src/common/include/GroupJoinRequest.class.php 2010-10-25 19:26:39 UTC (rev 11185)
@@ -3,7 +3,7 @@
* FusionForge
*
* Copyright 2005, GForge, LLC
- * Copyright 2009, Roland Mas
+ * Copyright 2009-2010, Roland Mas
*
* This file is part of FusionForge.
*
@@ -27,16 +27,17 @@
require_once $gfcommon.'include/Validator.class.php';
function &get_group_join_requests($Group) {
- if (!$Group || !is_object($Group) || $Group->isError()) {
- return false;
- } else {
+ $reqs = array () ;
+ if ($Group && is_object($Group) && !$Group->isError()) {
$res = db_query_params ('SELECT * FROM group_join_request WHERE group_id=$1',
array ($Group->getID())) ;
- while ($arr = db_fetch_array($res)) {
- $reqs[] = new GroupJoinRequest($Group,$arr['user_id'],$arr);
+ if (db_numrows ($res)) {
+ while ($arr = db_fetch_array($res)) {
+ $reqs[] = new GroupJoinRequest($Group,$arr['user_id'],$arr);
+ }
}
- return $reqs;
}
+ return $reqs ;
}
class GroupJoinRequest extends Error {
Modified: trunk/src/www/admin/approve-pending.php
===================================================================
--- trunk/src/www/admin/approve-pending.php 2010-10-25 17:20:04 UTC (rev 11184)
+++ trunk/src/www/admin/approve-pending.php 2010-10-25 19:26:39 UTC (rev 11185)
@@ -200,7 +200,8 @@
if (USE_PFO_RBAC) {
$submitter = NULL ;
- foreach (get_group_join_requests ($this) as $gjr) {
+ $project = group_get_object ($row_grp['group_id']) ;
+ foreach (get_group_join_requests ($project) as $gjr) {
$submitter = user_get_object($gjr->getUserID()) ;
echo '<p>'
.sprintf(_('Submitted by %1$s (%2$s)'), $submitter->getRealName(), $submitter->getUnixName())
More information about the Fusionforge-commits
mailing list