Email notify-on-fave moved to Profile_prefs (run upgrade.php)

[quix0rs-gnu-social.git] / actions / apitimelinetag.php

diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 31e18cf8ee8d28aa00da47fba7970405d4f57736..b3f17d0712019c9578f92f5fd8aa6dccbfe4b0f2 100644 (file)
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
-
 /**
  * Returns the 20 most recent notices tagged by a given tag
  *
@@ -139,7 +137,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
             $atom->setId($id);
             $atom->setTitle($title);
             $atom->setSubtitle($subtitle);
-            $atom->setLogo($logo);
+            $atom->setLogo($sitelogo);
             $atom->setUpdated('now');
 
             $atom->addLink($link);
@@ -179,7 +177,9 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
         $notice = Notice_tag::getStream(
             $this->tag,
             ($this->page - 1) * $this->count,
-            $this->count + 1
+            $this->count + 1,
+            $this->since_id,
+            $this->max_id
         );
 
         while ($notice->fetch()) {