From: Diogo Cordeiro <diogo@fc.up.pt>
Date: Fri, 3 May 2019 12:26:06 +0000 (+0100)
Subject: Merge branch 'ATOM-priority" from Alexandre Alapetite into HEAD
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=515682c0cd3b7000fb02c7b79d759c347f57da09;p=quix0rs-gnu-social.git

Merge branch 'ATOM-priority" from Alexandre Alapetite into HEAD
source: https://git.gnu.io/gnu/gnu-social/merge_requests/174
---

515682c0cd3b7000fb02c7b79d759c347f57da09
diff --cc actions/public.php
index a2958e8806,18613de892..dd69f7ef24
--- a/actions/public.php
+++ b/actions/public.php
@@@ -97,23 -97,23 +97,29 @@@ class PublicAction extends SitestreamAc
       */
      function getFeeds()
      {
-         return array(new Feed(Feed::JSON,
 -        return array(new Feed(Feed::ATOM,
 -                              common_local_url('ApiTimelinePublic',
 -                                               array('format' => 'atom')),
 -                              // TRANS: Link description for public timeline feed.
 -                              _('Public Timeline Feed (Atom)')),
 -                    new Feed(Feed::JSON,
--                              common_local_url('ApiTimelinePublic',
--                                               array('format' => 'as')),
--                              // TRANS: Link description for public timeline feed.
--                              _('Public Timeline Feed (Activity Streams JSON)')),
--                    new Feed(Feed::RSS1, common_local_url('publicrss'),
--                              // TRANS: Link description for public timeline feed.
--                              _('Public Timeline Feed (RSS 1.0)')),
-                      new Feed(Feed::RSS2,
 -                    new Feed(Feed::RSS2,
--                              common_local_url('ApiTimelinePublic',
--                                               array('format' => 'rss')),
-                               // TRANS: Link description for public timeline feed.
-                               _('Public Timeline Feed (RSS 2.0)')),
-                      new Feed(Feed::ATOM,
-                               common_local_url('ApiTimelinePublic',
-                                                array('format' => 'atom')),
--                              // TRANS: Link description for public timeline feed.
-                               _('Public Timeline Feed (Atom)')));
 -                              _('Public Timeline Feed (RSS 2.0)')));
++        return [
++            new Feed(Feed::ATOM,
++                     common_local_url('ApiTimelinePublic',
++                     array('format' => 'atom')),
++                     // TRANS: Link description for public timeline feed.
++                     _('Public Timeline Feed (Atom)')
++            ),
++            new Feed(Feed::JSON,
++                     common_local_url('ApiTimelinePublic',
++                     array('format' => 'as')),
++                     // TRANS: Link description for public timeline feed.
++                     _('Public Timeline Feed (Activity Streams JSON)')
++            ),
++            new Feed(Feed::RSS1, common_local_url('publicrss'),
++                     // TRANS: Link description for public timeline feed.
++                     _('Public Timeline Feed (RSS 1.0)')
++            ),
++            new Feed(Feed::RSS2,
++                     common_local_url('ApiTimelinePublic',
++                     array('format' => 'rss')),
++                     // TRANS: Link description for public timeline feed.
++                     _('Public Timeline Feed (RSS 2.0)')
++            ),
++        ];
      }
  }