[Fusionforge-commits] FusionForge branch master updated. v6.1beta1-107-g0be86a0

[Franck Villaume]

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  0be86a012d2ea0e89f85e96ab88f2eebe18d3766 (commit)
      from  7f4ed5d446279ecedd54f2490b33a5ff25f35c41 (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=0be86a012d2ea0e89f85e96ab88f2eebe18d3766

commit 0be86a012d2ea0e89f85e96ab88f2eebe18d3766
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Jan 5 16:08:09 2018 +0000

    fix double header in case of error

diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index 77b2377..0cab07c 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -92,7 +92,7 @@ $group = group_get_object($group_id);
 if (!$group || !is_object($group)) {
 	exit_no_group();
 } elseif ($group->isError()) {
-	exit_error($group->getErrorMessage(), 'home');
+	exit_error($group->getErrorMessage(), 'activity');
 } elseif (!forge_get_config('use_activity')) {
 	exit_disabled();
 } elseif (!$group->usesActivity()) {
@@ -101,8 +101,6 @@ if (!$group || !is_object($group)) {
 
 html_use_jqueryui();
 
-site_project_header(array('title'=>_('Activity'), 'group'=>$group_id, 'toptab'=>'activity'));
-
 $ids = array();
 $texts = array();
 
@@ -155,7 +153,7 @@ if (count($show) < 1) {
 $ffactivity = new Activity();
 $results = $ffactivity->getActivitiesForProject($group_id, $begin, $end, $section);
 if ($results === false) {
-	exit_error(_('Unable to get activities')._(':').$ffactivity->getErrorMessage(), 'home');
+	exit_error(_('Unable to get activities')._(':').$ffactivity->getErrorMessage(), 'activity');
 }
 // If plugins wants to add activities.
 $hookParams['group_id'] = $group_id;
@@ -173,10 +171,12 @@ if (count($show) < 1) {
 
 foreach ($show as $showthis) {
 	if (array_search($showthis, $ids) === false) {
-		exit_error(_('Invalid Data Passed to query'), 'home');
+		exit_error(_('Invalid Data Passed to query'), 'activity');
 	}
 }
 
+site_project_header(array('title'=>_('Activity'), 'group'=>$group_id, 'toptab'=>'activity'));
+
 if (count($ids) < 1) {
 	echo $HTML->information(_('No Activity Found'));
 } else {

-----------------------------------------------------------------------

Summary of changes:
 src/www/activity/index.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge