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 34583cc0f2bc5efa6956d7fb3186639192045704 (commit)
via 4a621a92afafe1a231b7ffa512bec4910729a663 (commit)
from c7f863e5625c56100db2308372f4576f1df67305 (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=34583cc0f2bc5efa6956d7fb3186639192045704
commit 34583cc0f2bc5efa6956d7fb3186639192045704
Author: Franck Villaume <[email protected]>
Date: Sat Dec 17 15:17:23 2016 +0100
fix missing global
diff --git
a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
index f5538cf..202d71a 100644
--- a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
+++ b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
@@ -329,6 +329,7 @@ _('Organise projects hierarchically, relation type 1-n');
* @access public
*/
function redirect($http_referer, $type, $message) {
+ global $warning_msg, $feedback, $error_msg;
switch ($type) {
case 'warning_msg': {
$warning_msg = $message;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4a621a92afafe1a231b7ffa512bec4910729a663
commit 4a621a92afafe1a231b7ffa512bec4910729a663
Author: Franck Villaume <[email protected]>
Date: Sat Dec 17 15:16:39 2016 +0100
support url_prefix in util_find_relative_referer
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index a6624ee..7583c89 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -995,7 +995,7 @@ function util_make_url($path = '', $prefix = '') {
* @return string
*/
function util_find_relative_referer($url) {
- $relative_url = str_replace(util_make_base_url(), '', $url);
+ $relative_url =
str_replace(util_make_base_url().normalized_urlprefix(), '', $url);
//now remove previous feedback, error_msg or warning_msg
$relative_url = preg_replace('/&error_msg=.*&/', '&', $relative_url);
$relative_url = preg_replace('/&warning_msg=.*&/', '&', $relative_url);
-----------------------------------------------------------------------
Summary of changes:
src/common/include/utils.php | 2 +-
.../projects-hierarchy/common/projects-hierarchyPlugin.class.php | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
