[Fusionforge-commits] FusionForge branch master updated. 7222a33956a28a07b1cc07586c118f2782a31564
Franck VILLAUME
nerville at fusionforge.org
Thu Feb 13 13:41:54 CET 2014
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 7222a33956a28a07b1cc07586c118f2782a31564 (commit)
via 12e09a7a5d214eee5b4d1db990f7bc6e40b05659 (commit)
from 4e6ecd4bb7b10cb70a9f8ec83547fef57dc95dca (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 -----------------------------------------------------------------
commit 7222a33956a28a07b1cc07586c118f2782a31564
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 13 13:38:26 2014 +0100
fix php warning
diff --git a/src/common/include/RBACEngine.class.php b/src/common/include/RBACEngine.class.php
index 9569636..989d815 100644
--- a/src/common/include/RBACEngine.class.php
+++ b/src/common/include/RBACEngine.class.php
@@ -225,10 +225,11 @@ class RBACEngine extends Error implements PFO_RBACEngine {
public function getRolesByAllowedAction ($section, $reference, $action = NULL) {
$ids = $this->_getRolesIdByAllowedAction ($section, $reference, $action);
$roles = array ();
- foreach ($ids as $role_id) {
- $roles[] = $this->getRoleById ($role_id);
+ if (is_array($ids)) {
+ foreach ($ids as $role_id) {
+ $roles[] = $this->getRoleById ($role_id);
+ }
}
-
return $roles;
}
commit 12e09a7a5d214eee5b4d1db990f7bc6e40b05659
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 13 13:39:40 2014 +0100
cronjob: create_scm_repos: use the right env.inc.php
diff --git a/src/cronjobs/create_scm_repos.php b/src/cronjobs/create_scm_repos.php
index 236f28e..b9980a6 100755
--- a/src/cronjobs/create_scm_repos.php
+++ b/src/cronjobs/create_scm_repos.php
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require dirname(__FILE__).'/../www/env.inc.php';
+require (dirname(__FILE__).'/../common/include/env.inc.php');
require_once $gfcommon.'include/pre.php';
require_once $gfcommon.'include/cron_utils.php';
-----------------------------------------------------------------------
Summary of changes:
src/common/include/RBACEngine.class.php | 7 ++++---
src/cronjobs/create_scm_repos.php | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list