diff options
| -rw-r--r-- | actions/tag.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/actions/tag.php b/actions/tag.php index 25cc853c4..ffb393ae8 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -69,7 +69,7 @@ class TagAction extends StreamAction { $this->public_views_menu(); } 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', 'version' => 'RSS 1.0', 'item' => 'tagrss'))); diff --git a/lib/util.php b/lib/util.php index 7518fbf55..fc45311fc 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1206,6 +1206,10 @@ function common_fancy_url($action, $args=NULL) { $path = 'tags'; } 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': $path = 'peopletag/' . $args['tag']; unset($args['tag']); @@ -1499,7 +1503,7 @@ function common_twitter_broadcast($notice, $flink) { CURLOPT_USERAGENT => "Laconica", CURLOPT_CONNECTTIMEOUT => 120, // XXX: Scary!!!! How long should this be? CURLOPT_TIMEOUT => 120, - + # Twitter is strict about accepting invalid "Expect" headers CURLOPT_HTTPHEADER => array('Expect:') ); |