[Fusionforge-commits] FusionForge branch Branch_5_3 updated. ca7a478a900a31eb8ac136754372a2f6d5b8d7e3

Franck Villaume nerville at fusionforge.org
Mon Mar 3 10:28:27 CET 2014


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, Branch_5_3 has been updated
       via  ca7a478a900a31eb8ac136754372a2f6d5b8d7e3 (commit)
      from  9f91ea38a493f8167d06088290dd20b6dd59bc17 (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 ca7a478a900a31eb8ac136754372a2f6d5b8d7e3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Mar 3 10:27:05 2014 +0100

    plugins scmgit, scmsvn: handle html entities, and adapt display in activity tab

diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index be4ae9a..79470aa 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -969,10 +969,10 @@ class GitPlugin extends SCMPlugin {
 					$result['section'] = 'scm';
 					$result['group_id'] = $group_id;
 					$result['ref_id'] = 'browser.php?group_id='.$group_id;
-					$result['description'] = $splitedLine[2].' (commit '.$splitedLine[3].')';
+					$result['description'] = htmlspecialchars($splitedLine[2]).' (commit '.$splitedLine[3].')';
 					$userObject = user_get_object_by_email($splitedLine[1]);
 					if (is_a($userObject, 'GFUser')) {
-						$result['realname'] = make_user_link($userObject->getUnixName(), $userObject->getRealName());
+						$result['realname'] = util_display_user($userObject->getUnixName(), $userObject->getID(), $userObject->getRealName());
 					} else {
 						$result['realname'] = '';
 					}
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index fbad84bd..f7bb9ed 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -627,7 +627,7 @@ class SVNPlugin extends SCMPlugin {
 					$result['section'] = 'scm';
 					$result['group_id'] = $group_id;
 					$result['ref_id'] = 'viewvc.php/?root='.$project->getUnixName();
-					$result['description'] = $message.' (r'.$revisions[$i].')';
+					$result['description'] = htmlspecialchars($message).' (r'.$revisions[$i].')';
 					$result['user_name'] = $users[$i];
 					$userObject = user_get_object_by_name($users[$i]);
 					if (is_a($userObject, 'GFUser')) {

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/scmgit/common/GitPlugin.class.php |    4 ++--
 src/plugins/scmsvn/common/SVNPlugin.class.php |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list