[Fusionforge-commits] FusionForge branch 6.0 updated. 8e18554 forum: remove double site header in attachment window

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Jun 7 10:31:59 CEST 2015


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, 6.0 has been updated
       via  8e18554f7026a53a0c56573198e129de725aa2a2 (commit)
      from  b3932de204fb3104ce18a2d8fb23ec80b7a87b04 (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 8e18554f7026a53a0c56573198e129de725aa2a2
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Jun 2 11:51:08 2015 +0200

    forum: remove double site header in attachment window

diff --git a/src/www/forum/attachment.php b/src/www/forum/attachment.php
index 582ccbc..432ba5e 100644
--- a/src/www/forum/attachment.php
+++ b/src/www/forum/attachment.php
@@ -6,7 +6,7 @@
  * The rest Copyright 2002-2004 (c) GForge Team
  * Coyright 2005, Daniel Perez
  * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014-2015, Franck Villaume - TrivialDev
  * http://fusionforge.org/
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -37,7 +37,7 @@ require_once $gfcommon.'forum/ForumStorage.class.php';
  */
 
 function goodbye($msg) {
-	site_header(array('title'=>_('Attachments')));
+	forum_header(array('title'=>_('Attachments')));
 	html_feedback_top($msg);
 	echo '<form method="post"><input type="button" value="'._('Close Window').'" onclick="window.close()" /></form>';
 	site_footer();
@@ -118,7 +118,6 @@ if ($edit == "yes") {
 	} else {
 		if ($doedit=="1") {
 			//actually edit the attach and save the info
-			forum_header(array('title'=>_('Attachments')));
 			$am = new AttachManager();
 			$fm = new ForumMessage($f, $msg_id, array(), false);
 			$am->SetForumMsg($fm);

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

Summary of changes:
 src/www/forum/attachment.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/www/forum/attachment.php b/src/www/forum/attachment.php
index 582ccbc..432ba5e 100644
--- a/src/www/forum/attachment.php
+++ b/src/www/forum/attachment.php
@@ -6,7 +6,7 @@
  * The rest Copyright 2002-2004 (c) GForge Team
  * Coyright 2005, Daniel Perez
  * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014-2015, Franck Villaume - TrivialDev
  * http://fusionforge.org/
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -37,7 +37,7 @@ require_once $gfcommon.'forum/ForumStorage.class.php';
  */
 
 function goodbye($msg) {
-	site_header(array('title'=>_('Attachments')));
+	forum_header(array('title'=>_('Attachments')));
 	html_feedback_top($msg);
 	echo '<form method="post"><input type="button" value="'._('Close Window').'" onclick="window.close()" /></form>';
 	site_footer();
@@ -118,7 +118,6 @@ if ($edit == "yes") {
 	} else {
 		if ($doedit=="1") {
 			//actually edit the attach and save the info
-			forum_header(array('title'=>_('Attachments')));
 			$am = new AttachManager();
 			$fm = new ForumMessage($f, $msg_id, array(), false);
 			$am->SetForumMsg($fm);


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list