Merge branch 'group-join-approve-reject-button-icons' into 'nightly'

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

diff --git a/actions/publicrss.php b/actions/publicrss.php
index 593888b9f66fd6fee0bd0f59333f4c174fc51dec..5dcff3ba3d2f973c11118c90ae7e20c7ad9c1678 100644 (file)
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Public RSS action class.
  *
@@ -29,11 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/rssaction.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * RSS feed for public timeline.
@@ -49,16 +44,6 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  */
 class PublicrssAction extends Rss10Action
 {
-    /**
-     * Initialization.
-     * 
-     * @return boolean true
-     */
-    function init()
-    {
-        return true;
-    }
-
     /**
      * Get notices
      *
@@ -66,15 +51,10 @@ class PublicrssAction extends Rss10Action
      *
      * @return array notices
      */
-    function getNotices($limit=0)
+    protected function getNotices()
     {
-        $notices = array();
-        $notice  = Notice::publicStream(0, ($limit == 0) ? 48 : $limit);
-        while ($notice->fetch()) {
-            $notices[] = clone($notice);
-        }
-        
-        return $notices;
+        $stream  = Notice::publicStream(0, $this->limit);
+        return $stream->fetchAll();
     }
 
      /**
@@ -84,11 +64,14 @@ class PublicrssAction extends Rss10Action
      */
     function getChannel()
     {
+        $sitename = common_config('site', 'name');
         $c = array(
-              'url' => common_local_url('publicrss')
-            , 'title' => sprintf(_('%s public timeline'), common_config('site', 'name'))
-            , 'link' => common_local_url('public')
-            , 'description' => sprintf(_('%s updates from everyone!'), common_config('site', 'name')));
+              'url' => common_local_url('publicrss'),
+            // TRANS: Public RSS feed title. %s is the StatusNet site name.
+              'title' => sprintf(_('%s public timeline'), $sitename),
+              'link' => common_local_url('public'),
+            // TRANS: Public RSS feed description. %s is the StatusNet site name.
+              'description' => sprintf(_('%s updates from everyone.'), $sitename));
         return $c;
     }
 
@@ -96,7 +79,7 @@ class PublicrssAction extends Rss10Action
      * Get image.
      *
      * @return nothing
-    */
+     */
     function getImage()
     {
         // nop
@@ -107,4 +90,3 @@ class PublicrssAction extends Rss10Action
         return true;
     }
 }
-