diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-08-02 18:13:10 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-08-02 18:13:10 -0400 |
| commit | c65056aa8d711804c8b365542db3890db425ae5a (patch) | |
| tree | 66fc66d27c8cbb3e5e32be475d3f0bd61ce39ec4 /actions | |
| parent | fdaba2e94bf4948c14408c14865e8fc03e33cc43 (diff) | |
| parent | e670e4306bf3e0e7e90523bcbfa2eb8060f4ed67 (diff) | |
Merge commit 'jeff-themovie/0.8.x-small-fixes-2' into 0.8.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/conversation.php | 2 | ||||
| -rw-r--r-- | actions/twitapigroups.php | 5 | ||||
| -rw-r--r-- | actions/twitapitags.php | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/actions/conversation.php b/actions/conversation.php index c8755ba6e..6b5d8d54d 100644 --- a/actions/conversation.php +++ b/actions/conversation.php @@ -167,6 +167,8 @@ class ConversationTree extends NoticeList function _buildTree() { + $cnt = 0; + $this->tree = array(); $this->table = array(); diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php index f899bc369..82604ebff 100644 --- a/actions/twitapigroups.php +++ b/actions/twitapigroups.php @@ -114,8 +114,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'])) { @@ -127,7 +126,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; 'api/laconica/groups/timeline.atom'; } $this->show_atom_timeline($notice, $title, $id, $link, - $subtitle, $suplink, $selfuri); + $subtitle, null, $selfuri); break; case 'json': $this->show_json_timeline($notice); 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); |