From fe57e2e06b3ae5e7eb9001a0ffe80d9a7d20a5be Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Sun, 2 Aug 2009 19:47:36 +0800
Subject: Fixed PHP Notice "Undefined variable: suplink"

---
 actions/twitapigroups.php | 5 ++---
 actions/twitapitags.php   | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'actions')

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);
-- 
cgit v1.2.3-54-g00ecf


From 20c536fdd461c8f39dd6a03751b534a996a94078 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Sun, 2 Aug 2009 19:52:27 +0800
Subject: Fixed PHP Notice "Undefined variable: cnt"

---
 actions/conversation.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actions')

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();
 
-- 
cgit v1.2.3-54-g00ecf