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 aeece8070a7f75ef5b41f8d7ee3e521cb5a3d2ed (commit)
from 2b0a8ba8fc3973f1d4594f8ee8b3b913cb1e9e35 (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=aeece8070a7f75ef5b41f8d7ee3e521cb5a3d2ed
commit aeece8070a7f75ef5b41f8d7ee3e521cb5a3d2ed
Author: Franck Villaume <[email protected]>
Date: Sat Jul 4 16:04:05 2015 +0200
fix layout: handle absolute rss correctly
diff --git a/src/CHANGES b/src/CHANGES
index f15dcaa..a0f6784 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,3 +1,6 @@
+Fusionforge 6.0.3:
+* Layout: fix rss url when url is absolute (TrivialDev)
+
FusionForge 6.0.2:
* Accounts: fix elliptic curve ssh keys support (Inria)
* Project stats: fix misleading label on statistics default empty graph (Inria)
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index afa9461..18a70de 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1362,7 +1362,12 @@ if (isset($params['group']) && $params['group']) {
}
if ($widget->hasRss()) {
echo html_ao('div', array('class' =>
'widget_titlebar_rss'));
- echo util_make_link($widget->getRssUrl($owner_id,
$owner_type), 'rss');
+ $url = $widget->getRssUrl($owner_id, $owner_type);
+ if (util_check_url($url)) {
+ echo
util_make_link($widget->getRssUrl($owner_id, $owner_type), 'rss', array(),
true);
+ } else {
+ echo
util_make_link($widget->getRssUrl($owner_id, $owner_type), 'rss');
+ }
echo html_ac(html_ap() -1);
}
echo html_ac(html_ap() -1);
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 3 +++
src/www/include/Layout.class.php | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
