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 9cbad3171ac9e8e5afcb49540458a96b212a3224 (commit)
from 47a50db2a644504931579ef84ecea2ee94d0bbf4 (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=9cbad3171ac9e8e5afcb49540458a96b212a3224
commit 9cbad3171ac9e8e5afcb49540458a96b212a3224
Author: Franck Villaume <[email protected]>
Date: Wed May 4 13:40:59 2016 +0200
fix [#813] SVN activity crashes in case of private repository
diff --git a/src/CHANGES b/src/CHANGES
index 8928aab..1b5b287 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,3 +1,6 @@
+FusionForge 6.0.5:
+* Plugin SCM SVN: fix activity when SVN repository is private [#813]
(TrivialDev)
+
FusionForge 6.0.4:
* Account Management System: fix sysCreateUser for UNIX: unix_gid dropped
(TrivialDev)
* Accounts: do not accept digits-only user and group names, to avoid confusion
with UID/GID in system commands (Inria)
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 89c32f3..91b2d4c 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -5,7 +5,7 @@
* Copyright 2003-2010, Roland Mas, Franck Villaume
* Copyright 2004, GForge, LLC
* Copyright 2010, Alain Peyrat <[email protected]>
- * Copyright 2012-2014, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2016, Franck Villaume - TrivialDev
* Copyright 2013, French Ministry of National Education
*
* This file is part of FusionForge.
@@ -563,18 +563,23 @@ some control over it to the project's administrator.");
if (in_array('scmsvn', $params['show']) ||
(count($params['show']) < 1)) {
$start_time = $params['begin'];
$end_time = $params['end'];
-
+
$xml_parser = xml_parser_create();
xml_set_element_handler($xml_parser,
"SVNPluginStartElement", "SVNPluginEndElement");
xml_set_character_data_handler($xml_parser,
"SVNPluginCharData");
// Grab&parse commit log
$protocol = forge_get_config('use_ssl', 'scmsvn') ?
'https://' : 'http://';
- $u = session_get_user();
- if ($project->enableAnonSCM())
+ if ($project->enableAnonSCM()) {
$server_script = '/anonscm/svnlog';
- else
- $server_script =
'/authscm/'.$u->getUnixName().'/svnlog';
+ } else {
+ $u = session_get_user();
+ if ($u && !$u->isError()) {
+ $server_script =
'/authscm/'.$u->getUnixName().'/svnlog';
+ } else {
+ return false;
+ }
+ }
$script_url = $protocol . forge_get_config('scm_host')
. $server_script
.'?unix_group_name='.$project->getUnixName()
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 3 +++
src/plugins/scmsvn/common/SVNPlugin.class.php | 17 +++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
