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.1 has been updated
via 11dfc428f13f34ec235d7dbdee19f0c4a751540e (commit)
via f4aeeb5383873ae92ad12f5641d43816b4b04dce (commit)
from 068534da19bbeb8edeb18cd1933ccb3e08cbb084 (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=11dfc428f13f34ec235d7dbdee19f0c4a751540e
commit 11dfc428f13f34ec235d7dbdee19f0c4a751540e
Author: Franck Villaume <[email protected]>
Date: Mon Jan 1 17:11:11 2018 +0100
rss activity: fix html entities in URL & comment author since some html is
present in the author and breaks the RSS
diff --git a/src/www/export/rss20_activity.php
b/src/www/export/rss20_activity.php
index ab8680b..a6a00fa 100644
--- a/src/www/export/rss20_activity.php
+++ b/src/www/export/rss20_activity.php
@@ -84,7 +84,7 @@ if ($group_id) {
$texts = array();
$show = array();
- $hookParams['group'] = $group_id ;
+ $hookParams['group_id'] = $group_id ;
$hookParams['results'] = &$results;
$hookParams['show'] = &$show;
$hookParams['begin'] = time()-(30*86400);
@@ -104,8 +104,8 @@ if ($group_id) {
}
print " <item>\n";
print " <title>".htmlspecialchars('Commit
:'.$arr['description'])."</title>\n";
- print "
<link>".util_make_url('/scm/'.$arr['ref_id'].$arr['subref_id'])."</link>\n";
- print "
<comments>".util_make_url('/scm/'.$arr['ref_id'].$arr['subref_id'])."</comments>\n";
+ print "
<link>".util_make_url('/scm/'.htmlentities($arr['ref_id'].$arr['subref_id']))."</link>\n";
+ print "
<comments>".util_make_url('/scm/'.htmlentities($arr['ref_id'].$arr['subref_id']))."</comments>\n";
$arr['category'] = _('Source Code');
break;
}
@@ -209,11 +209,12 @@ if ($group_id) {
if (isset($arr['category']) && $arr['category']) {
print " <category>".$arr['category']."</category>\n";
}
- if (isset($arr['user_name']) && $arr['user_name']) {
- print "
<author>".$arr['user_name']."@".forge_get_config('users_host')."
(".$arr['realname'].")</author>\n";
- } else {
- print " <author>".$arr['realname']."</author>\n";
- }
+//TODO: fix the HTML in the arr['realname']. Get a new way to display user
info in activity.
+// if (isset($arr['user_name']) && $arr['user_name']) {
+// print "
<author>".$arr['user_name']."@".forge_get_config('users_host')."
(".$arr['realname'].")</author>\n";
+// } else {
+// print " <author>".$arr['realname']."</author>\n";
+// }
print "
<pubDate>".rss_date($arr['activity_date'])."</pubDate>\n";
print " </item>\n";
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f4aeeb5383873ae92ad12f5641d43816b4b04dce
commit f4aeeb5383873ae92ad12f5641d43816b4b04dce
Author: Franck Villaume <[email protected]>
Date: Mon Jan 1 17:10:25 2018 +0100
less code
diff --git a/src/www/export/tracker.php b/src/www/export/tracker.php
index 6a8df19..afe4d28 100644
--- a/src/www/export/tracker.php
+++ b/src/www/export/tracker.php
@@ -195,8 +195,7 @@ if ($group_id && $atid) {
echo '</tracker>';
} else {
beginDocument();
- displayError('Project ID or Artifact ID Not Set');
- endDocument();
+ endOnError('Project ID or Artifact ID Not Set');
}
// Local Variables:
-----------------------------------------------------------------------
Summary of changes:
src/www/export/rss20_activity.php | 17 +++++++++--------
src/www/export/tracker.php | 3 +--
2 files changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
