GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Corrected links to tagrss and add fancy URL for tag rss

Browse Source
This commit is contained in:
Evan Prodromou
2009-01-10 14:53:14 -05:00
parent 2a7d73ed6b
commit 01d1c3bd5f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/tag.php
View File

@@ -69,7 +69,7 @@ class TagAction extends StreamAction {
$this->public_views_menu(); $this->public_views_menu();
} }
else { else {
$this->show_feeds_list(array(0=>array('href'=>common_local_url('tagrss'), $this->show_feeds_list(array(0=>array('href'=>common_local_url('tagrss', array('tag' => $tag)),
'type' => 'rss', 'type' => 'rss',
'version' => 'RSS 1.0', 'version' => 'RSS 1.0',
'item' => 'tagrss'))); 'item' => 'tagrss')));

6
lib/util.php
View File

@@ -1206,6 +1206,10 @@ function common_fancy_url($action, $args=NULL) {
$path = 'tags'; $path = 'tags';
} }
return common_path($path . (($args) ? ('?' . http_build_query($args)) : '')); return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
case 'tagrss':
$path = 'tag/' . $args['tag'] . '/rss';
unset($args['tag']);
return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
case 'peopletag': case 'peopletag':
$path = 'peopletag/' . $args['tag']; $path = 'peopletag/' . $args['tag'];
unset($args['tag']); unset($args['tag']);
@@ -1499,7 +1503,7 @@ function common_twitter_broadcast($notice, $flink) {
CURLOPT_USERAGENT => "Laconica", CURLOPT_USERAGENT => "Laconica",
CURLOPT_CONNECTTIMEOUT => 120, // XXX: Scary!!!! How long should this be? CURLOPT_CONNECTTIMEOUT => 120, // XXX: Scary!!!! How long should this be?
CURLOPT_TIMEOUT => 120, CURLOPT_TIMEOUT => 120,
# Twitter is strict about accepting invalid "Expect" headers # Twitter is strict about accepting invalid "Expect" headers
CURLOPT_HTTPHEADER => array('Expect:') CURLOPT_HTTPHEADER => array('Expect:')
); );