[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 8a2e8a1bfdf44ff952a3d989896373e5e0f8ea08
Franck VILLAUME
nerville at fusionforge.org
Thu Feb 13 13:40:09 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, Branch_5_3 has been updated
via 8a2e8a1bfdf44ff952a3d989896373e5e0f8ea08 (commit)
via 12bbed26e308c6ee6338da0dfeb8662474fcb061 (commit)
from de6f2200f227ac38ecdc1823cc33ea03d7656daf (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 8a2e8a1bfdf44ff952a3d989896373e5e0f8ea08
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';
commit 12bbed26e308c6ee6338da0dfeb8662474fcb061
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 c46a295..e814d40 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;
}
-----------------------------------------------------------------------
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