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 fb0d2618ebe88777c48d3cec7720003090199742 (commit)
via 8e18554f7026a53a0c56573198e129de725aa2a2 (commit)
via b3932de204fb3104ce18a2d8fb23ec80b7a87b04 (commit)
from 086eac05901cbcd8b89f0fa9608560aad1a057a8 (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 fb0d2618ebe88777c48d3cec7720003090199742
Merge: 086eac0 8e18554
Author: Franck Villaume <[email protected]>
Date: Sun Jun 7 11:04:08 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/www/forum/attachment.php | 5 ++---
src/www/scm/viewvc.php | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/CHANGES b/src/CHANGES
index 3f27b5f..2cc274b 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -7,6 +7,7 @@ FusionForge 6.0.1:
* Tracker: fix HTML entities in mail notifications (Inria)
* Widgets: MyProjects: only display active projects (Inria)
* SCM SVN: fix double-compression in ViewVC (Inria)
+* SCM SVN: support files with spaces in ViewVC (Inria)
* Plugin scmhook: git commitemail: fix subject, handle special chars (Roland
Mas, for Inria)
* Plugin scmhook: fix hook deactivation (Inria)
* Doc clean-up (Inria)
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);
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index 52f620b..931c936 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -96,9 +96,10 @@ if ($external_scm) {
$server_script = '/authscm/'.$u->getUnixName().'/viewvc';
// pass the parameters passed to this script to the remote script in
the same fashion
$protocol = forge_get_config('use_ssl', 'scmsvn')? 'https://' :
'http://';
+ $pathinfo = (isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '/');
+ $pathinfo = preg_replace('/ /', '%20', $pathinfo);
$script_url = $protocol . forge_get_config('scm_host') . $server_script
- . (isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '/')
- . '?' . $_SERVER["QUERY_STRING"];
+ . $pathinfo . '?' . $_SERVER["QUERY_STRING"];
if ($redirect) {
header("Location: $script_url");
exit(0);
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
