diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-08-03 22:47:57 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-08-03 22:47:57 +0000 |
| commit | dccd4aa68d7ae449434c63380f21d8070913778f (patch) | |
| tree | 1a25d40f20326047eb0776f910e155362e8e33cb /actions/twitapitags.php | |
| parent | 981fa1b33a8073bd0d53d8bee7dfccd171685e61 (diff) | |
| parent | ff6e976d0315c57fc5b7e31845e9a3bad4f095bc (diff) | |
Merge branch '0.8.x' into twitter-oauth
Diffstat (limited to 'actions/twitapitags.php')
| -rw-r--r-- | actions/twitapitags.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actions/twitapitags.php b/actions/twitapitags.php index 5c8527530..e19e1b1ed 100644 --- a/actions/twitapitags.php +++ b/actions/twitapitags.php @@ -88,8 +88,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; $this->show_xml_timeline($notice); break; case 'rss': - $this->show_rss_timeline($notice, $title, $link, - $subtitle, $suplink); + $this->show_rss_timeline($notice, $title, $link, $subtitle); break; case 'atom': if (isset($apidata['api_arg'])) { @@ -101,7 +100,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; 'api/laconica/tags/timeline.atom'; } $this->show_atom_timeline($notice, $title, $id, $link, - $subtitle, $suplink, $selfuri); + $subtitle, null, $selfuri); break; case 'json': $this->show_json_timeline($notice); |