[Fusionforge-commits] r14691 - trunk/src/www/export

Alain Peyrat aljeux at fusionforge.org
Mon Oct 24 13:49:53 CEST 2011


Author: aljeux
Date: 2011-10-24 13:49:53 +0200 (Mon, 24 Oct 2011)
New Revision: 14691

Modified:
   trunk/src/www/export/rss20_activity.php
   trunk/src/www/export/rss20_news.php
Log:
Use util_make_url() when possible

Modified: trunk/src/www/export/rss20_activity.php
===================================================================
--- trunk/src/www/export/rss20_activity.php	2011-10-23 16:22:00 UTC (rev 14690)
+++ trunk/src/www/export/rss20_activity.php	2011-10-24 11:49:53 UTC (rev 14691)
@@ -57,7 +57,7 @@
        ';
 	print " <channel>\n";
 	print "  <title>".forge_get_config ('forge_name')." $title Activity</title>\n";
-	print "  <link>$url/activity/$link</link>\n";
+	print "  <link>".util_make_url("/activity/$link")."</link>\n";
 	print "  <description>".forge_get_config ('forge_name')." Project Activity$description</description>\n";
 	print "  <language>en-us</language>\n";
 	print "  <copyright>Copyright ".date("Y")." ".forge_get_config ('forge_name')."</copyright>\n";

Modified: trunk/src/www/export/rss20_news.php
===================================================================
--- trunk/src/www/export/rss20_news.php	2011-10-23 16:22:00 UTC (rev 14690)
+++ trunk/src/www/export/rss20_news.php	2011-10-24 11:49:53 UTC (rev 14691)
@@ -90,14 +90,15 @@
 
 // ## item outputs
 while ($row = db_fetch_array($res)) {
-	print "  <item>\n";
-	print "   <title>".htmlspecialchars($row['summary'])."</title>\n";
 	// if news group, link is main page
 	if ($row['group_id'] != forge_get_config('news_group')) {
-		print "   <link>http://".forge_get_config('web_host')."/forum/forum.php?forum_id=".$row['forum_id']."</link>\n";
+		$link = util_make_url("/forum/forum.php?forum_id=".$row['forum_id']);
 	} else {
-		print "   <link>http://".forge_get_config('web_host')."/</link>\n";
+		$link = util_make_url('/');
 	}
+	print "  <item>\n";
+	print "   <title>".htmlspecialchars($row['summary'])."</title>\n";
+	print "   <link>$link</link>\n";
 	print "   <description>".rss_description($row['details'])."</description>\n";
 	print "   <author>".$row['user_name']."@".forge_get_config('users_host')." (".$row['realname'].")</author>\n";
 	print "   <pubDate>".rss_date($row['post_date'])."</pubDate>\n";




More information about the Fusionforge-commits mailing list