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 4b9e72633c9753c4e6d5743248192217f5287dc9 (commit)
via bdf64d9626fdae9fdb7193508020c16481656c79 (commit)
from 58186b33ac50c7c4c9cb33e0f8f1c62a55e0f08c (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=4b9e72633c9753c4e6d5743248192217f5287dc9
commit 4b9e72633c9753c4e6d5743248192217f5287dc9
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Fri Sep 16 19:50:43 2016 +0200
fix syntax
diff --git a/src/common/include/logger.php b/src/common/include/logger.php
index 0dcfa81..2ef55af 100644
--- a/src/common/include/logger.php
+++ b/src/common/include/logger.php
@@ -50,7 +50,7 @@ if (isset($group_id) && is_numeric($group_id) && $group_id) {
SELECT *
FROM groups
WHERE unix_group_name=$1
- AND status IN ($2,$3)',
+ AND status IN ($2, $3, $4)',
array ($group_name,
'A', 'H', 'P'));
@@ -83,8 +83,7 @@ if (isset($group_id) && is_numeric($group_id) && $group_id) {
global $RESTPATH_PROJECTS_SUBPAGE2;
$RESTPATH_PROJECTS_SUBPAGE2 = $subpage2;
- }
- else {
+ } else {
$RESTPATH_PROJECTS_GROUP_ID = -1;
}
}
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 46cb1f9..c2b3052 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -1056,7 +1056,7 @@ function site_project_header($params) {
if ($project->isPermissionDeniedError()) {
if (!session_get_user()) {
$error_msg = $project->getErrorMessage();
- $next = '/account/login.php');
+ $next = '/account/login.php';
if (getStringFromServer('REQUEST_METHOD') !=
'POST') {
$next .=
'&return_to='.urlencode(getStringFromServer('REQUEST_URI'));
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bdf64d9626fdae9fdb7193508020c16481656c79
commit bdf64d9626fdae9fdb7193508020c16481656c79
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Fri Sep 16 19:35:40 2016 +0200
remove dead code
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index b9c6860..6432977 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -714,16 +714,6 @@ class Group extends FFError {
}
/**
- * getType() - project, etc. // OBSOLETE. Always return 1.
- *
- * @return int The type flag from the database.
- */
- function getType() {
- return 1;
- }
-
-
- /**
* getStatus - the status code.
*
* Statuses char include I,H,A,D,P.
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Group.class.php | 10 ----------
src/common/include/logger.php | 5 ++---
src/www/include/html.php | 2 +-
3 files changed, 3 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
