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 c40f94545421dfb331eb4e2eab3b51c996ccc9aa (commit)
from e2f3852d8c81badca9a3e7a15a0dd263743c86ec (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=c40f94545421dfb331eb4e2eab3b51c996ccc9aa
commit c40f94545421dfb331eb4e2eab3b51c996ccc9aa
Author: Franck Villaume <[email protected]>
Date: Mon Oct 10 09:42:17 2016 +0200
fix cache error. no permanent redirection
diff --git a/src/plugins/headermenu/action/addLink.php
b/src/plugins/headermenu/action/addLink.php
index 81dca7d..129a2f5 100644
--- a/src/plugins/headermenu/action/addLink.php
+++ b/src/plugins/headermenu/action/addLink.php
@@ -46,17 +46,17 @@ if (!empty($name) && !empty($linkmenu)) {
if (util_check_url($link)) {
if ($headermenu->addLink($link, $name,
$description, $linkmenu)) {
$feedback = _('Task
succeeded.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url,
false);
}
$error_msg = _('Task failed');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
} else {
$error_msg = _('Provided Link is not a
valid URL.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
}
$warning_msg = _('Missing Link URL.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
break;
}
case 'outermenu':
@@ -69,27 +69,27 @@ if (!empty($name) && !empty($linkmenu)) {
}
if ($headermenu->addLink($link, $name,
$description, $linkmenu, $linktype, $group_id)) {
$feedback = _('Task
succeeded.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url,
false);
}
$error_msg = _('Task failed');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
} else {
$error_msg = _('Provided Link is not a
valid URL.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
}
if (!empty($htmlcode)) {
if ($headermenu->addLink('', $name,
$description, $linkmenu, 'htmlcode', $group_id, $htmlcode)) {
$feedback = _('Task succeeded.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
$error_msg = _('Task failed');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
$warning_msg = _('Missing Link URL or HTML Page.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
}
}
$warning_msg = _('No link to create or name missing.');
-session_redirect($redirect_url);
+session_redirect($redirect_url, false);
diff --git a/src/plugins/headermenu/action/deleteLink.php
b/src/plugins/headermenu/action/deleteLink.php
index 8962f8b..c9f1730 100644
--- a/src/plugins/headermenu/action/deleteLink.php
+++ b/src/plugins/headermenu/action/deleteLink.php
@@ -34,10 +34,10 @@ if (isset($group_id) && $group_id) {
if (!empty($idLink)) {
if ($headermenu->deleteLink($idLink)) {
$feedback = _('Link deleted');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
$error_msg = _('Task failed');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
$warning_msg = _('Missing Link to be deleted.');
-session_redirect($redirect_url);
+session_redirect($redirect_url, false);
diff --git a/src/plugins/headermenu/action/updateLinkStatus.php
b/src/plugins/headermenu/action/updateLinkStatus.php
index 488e4d6..cd6207f 100644
--- a/src/plugins/headermenu/action/updateLinkStatus.php
+++ b/src/plugins/headermenu/action/updateLinkStatus.php
@@ -35,10 +35,10 @@ if (isset($group_id) && $group_id) {
if (!empty($idLink)) {
if ($headermenu->updateLinkStatus($idLink, $linkStatus)) {
$feedback = _('Link Status updated');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
$error_msg = _('Task failed');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
$warning_msg = _('Missing Link or status to be updated.');
-session_redirect($redirect_url);
+session_redirect($redirect_url, false);
diff --git a/src/plugins/headermenu/action/updateLinkValue.php
b/src/plugins/headermenu/action/updateLinkValue.php
index f9dc149..bf20c16 100644
--- a/src/plugins/headermenu/action/updateLinkValue.php
+++ b/src/plugins/headermenu/action/updateLinkValue.php
@@ -45,17 +45,17 @@ if (!empty($idLink) && !empty($name)) {
if (util_check_url($link)) {
if ($headermenu->updateLink($idLink,
$link, $name, $description, $linkmenu)) {
$feedback = _('Task
succeeded.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url,
false);
}
$error_msg = _('Task failed');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
} else {
$error_msg = _('Provided Link is not a
valid URL.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
}
$warning_msg = _('Missing Link URL.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
break;
}
case 'outermenu':
@@ -64,27 +64,27 @@ if (!empty($idLink) && !empty($name)) {
if (util_check_url($link)) {
if ($headermenu->updateLink($idLink,
$link, $name, $description, $linkmenu, $typemenu)) {
$feedback = _('Task
succeeded.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url,
false);
}
$error_msg = _('Task failed');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
} else {
$error_msg = _('Provided Link is not a
valid URL.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
}
if (!empty($htmlcode) && $typemenu == 'htmlcode') {
if ($headermenu->updateLink($idLink, '', $name,
$description, $linkmenu, 'htmlcode', $htmlcode)) {
$feedback = _('Task succeeded.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
$error_msg = _('Task failed');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
$warning_msg = _('Missing Link URL or HTML Page.');
- session_redirect($redirect_url);
+ session_redirect($redirect_url, false);
}
}
}
$warning_msg = _('No link to update or name missing.');
-session_redirect($redirect_url);
+session_redirect($redirect_url, false);
-----------------------------------------------------------------------
Summary of changes:
src/plugins/headermenu/action/addLink.php | 22 +++++++++++-----------
src/plugins/headermenu/action/deleteLink.php | 6 +++---
src/plugins/headermenu/action/updateLinkStatus.php | 6 +++---
src/plugins/headermenu/action/updateLinkValue.php | 22 +++++++++++-----------
4 files changed, 28 insertions(+), 28 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
