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 a3b964b3574f32dfb460860a582abc67b680609e (commit)
from e426f0bd8eda5981afd5a632c30641d1e27a9c98 (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=a3b964b3574f32dfb460860a582abc67b680609e
commit a3b964b3574f32dfb460860a582abc67b680609e
Author: Franck Villaume <[email protected]>
Date: Fri Nov 18 12:14:36 2016 +0100
fix [#835], [#836]: forum redirection cache
diff --git a/src/CHANGES b/src/CHANGES
index 508cce0..9f67c71 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,4 +1,5 @@
FusionForge 6.0.5:
+* Forum: fix redirection cache [#835] & [#836] (TrivialDev)
* Plugin SCM SVN: fix activity when SVN repository is private [#813]
(TrivialDev)
* Plugin SCM SVN: fix support old svn clients (Inria)
* Plugin SCM Git: fix activity when Git repository is private [#825]
(TrivialDev)
diff --git a/src/www/forum/index.php b/src/www/forum/index.php
index 5616f4d..c052a9e 100644
--- a/src/www/forum/index.php
+++ b/src/www/forum/index.php
@@ -6,7 +6,7 @@
* Copyright 2002, Tim Perdue - GForge, LLC
* Copyright 2010 (c) Franck Villaume - Capgemini
* Copyright (C) 2011-2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -47,7 +47,7 @@ if ($group_id) {
$farr = $ff->getForums();
if ( $farr !== false && count($farr) == 1 ) {
-
session_redirect('/forum/forum.php?forum_id='.$farr[0]->getID());
+
session_redirect('/forum/forum.php?forum_id='.$farr[0]->getID(), false);
}
forum_header(array('title'=>sprintf(_('Forums for %s'),
$g->getPublicName()) ));
diff --git a/src/www/forum/monitor.php b/src/www/forum/monitor.php
index 52bb843..6fe030e 100644
--- a/src/www/forum/monitor.php
+++ b/src/www/forum/monitor.php
@@ -5,6 +5,7 @@
* Copyright 1999-2001, Tim Perdue - Sourceforge
* Copyright 2002, Tim Perdue - GForge, LLC
* Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -53,7 +54,7 @@ if ($forum_id && $group_id) {
$confirm = getStringFromRequest('confirm');
$cancel = getStringFromRequest('cancel');
if ($cancel) {
-
session_redirect('/forum/forum.php?forum_id='.$forum_id.'&group_id='.$group_id);
+
session_redirect('/forum/forum.php?forum_id='.$forum_id.'&group_id='.$group_id,
false);
}
if (!$confirm) {
forum_header(array('title'=>_('Stop Monitoring'),
'modal' => 1));
@@ -70,14 +71,14 @@ if ($forum_id && $group_id) {
exit_error($f->getErrorMessage(),'forums');
} else {
$feedback = _('Forum Monitoring Deactivated');
-
session_redirect('/forum/forum.php?forum_id='.$forum_id.'&group_id='.$group_id);
+
session_redirect('/forum/forum.php?forum_id='.$forum_id.'&group_id='.$group_id,
false);
}
- } elseif(getIntFromRequest('start')) {
+ } elseif (getIntFromRequest('start')) {
if (!$f->setMonitor()) {
exit_error($f->getErrorMessage(),'forums');
} else {
$feedback = _('Forum Monitoring Started');
-
session_redirect('/forum/forum.php?forum_id='.$forum_id.'&group_id='.$group_id);
+
session_redirect('/forum/forum.php?forum_id='.$forum_id.'&group_id='.$group_id,
false);
}
}
} else {
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/www/forum/index.php | 4 ++--
src/www/forum/monitor.php | 9 +++++----
3 files changed, 8 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
