diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-08-04 15:53:15 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-08-04 15:53:15 +0000 |
| commit | d0a020dd4ea8d58bc8230ebcde22e54ad31894a8 (patch) | |
| tree | c7d14f1e09bd46c72e577ca54645a7bab4a747e7 /actions/twitapitags.php | |
| parent | 5f3af3e121a7ff06f5961bb4158e0b777ce5b5c1 (diff) | |
| parent | ffa1d662a759a729151f2444bdf759749d59045e (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
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); |