X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelinepublic.php;h=9034614253d438b5566a1993c6b1da0182094b18;hb=a93d0dc16af0438af59d14f8413dabb80c13b707;hp=c1fa72a3ee372f72e944931f86c6480bff17aabc;hpb=c465f675d9dbcf9f808bc31a1d01e753df4ddf58;p=quix0rs-gnu-social.git

diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index c1fa72a3ee..9034614253 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -75,10 +75,6 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
 
         $this->notices = $this->getNotices();
 
-        if ($this->since) {
-            throw new ServerException("since parameter is disabled for performance; use since_id", 403);
-        }
-
         return true;
     }
 
@@ -109,9 +105,10 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
         $sitename   = common_config('site', 'name');
         $sitelogo   = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png');
         $title      = sprintf(_("%s public timeline"), $sitename);
-        $taguribase = common_config('integration', 'taguri');
+        $taguribase = TagURI::base();
         $id         = "tag:$taguribase:PublicTimeline";
-        $link       = common_root_url();
+        $link       = common_local_url('public');
+        $self       = $this->getSelfUri();
         $subtitle   = sprintf(_("%s updates from everyone!"), $sitename);
 
         switch($this->format) {
@@ -119,10 +116,20 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $sitelogo);
+            $this->showRssTimeline(
+                $this->notices,
+                $title,
+                $link,
+                $subtitle,
+                null,
+                $sitelogo,
+                $self
+            );
             break;
         case 'atom':
 
+            header('Content-Type: application/atom+xml; charset=utf-8');
+
             $atom = new AtomNoticeFeed();
 
             $atom->setId($id);
@@ -130,16 +137,8 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
             $atom->setSubtitle($subtitle);
             $atom->setLogo($sitelogo);
             $atom->setUpdated('now');
-
             $atom->addLink(common_local_url('public'));
-
-            $atom->addLink(
-                $this->getSelfUri(
-                    'ApiTimelinePublic', array('format' => 'atom')
-                ),
-                array('rel' => 'self', 'type' => 'application/atom+xml')
-            );
-
+            $atom->setSelfLink($self);
             $atom->addEntryFromNotices($this->notices);
 
             $this->raw($atom->getString());