X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinetag.php;h=b3f17d0712019c9578f92f5fd8aa6dccbfe4b0f2;hb=cd3cff451f2ac12ebe1b98c6ab643a0e4e931599;hp=6c3b135ed93c95ae31e08235aa010250b2cb3623;hpb=36b331d469b6dcd1101783f21265f7be624bc58f;p=quix0rs-gnu-social.git diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php index 6c3b135ed9..b3f17d0712 100644 --- 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); @@ -153,7 +151,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction $this->showJsonTimeline($this->notices); break; case 'as': - header('Content-Type: application/json; charset=utf-8'); + header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE); $doc = new ActivityStreamJSONDocument($this->auth_user); $doc->setTitle($title); $doc->addLink($link, 'alternate', 'text/html'); @@ -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()) {