summaryrefslogtreecommitdiff
path: root/actions/twitapitags.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-08-02 18:13:10 -0400
committerCraig Andrews <candrews@integralblue.com>2009-08-02 18:13:10 -0400
commitc65056aa8d711804c8b365542db3890db425ae5a (patch)
tree66fc66d27c8cbb3e5e32be475d3f0bd61ce39ec4 /actions/twitapitags.php
parentfdaba2e94bf4948c14408c14865e8fc03e33cc43 (diff)
parente670e4306bf3e0e7e90523bcbfa2eb8060f4ed67 (diff)
Merge commit 'jeff-themovie/0.8.x-small-fixes-2' into 0.8.x
Diffstat (limited to 'actions/twitapitags.php')
-rw-r--r--actions/twitapitags.php5
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);