X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fallrss.php;h=885a67f6188af13b07a0ea7e6bf9a8302078e476;hb=da512ad8c2b4cba719204d8a8f42ecba9716702e;hp=bacb343ce089954417e4af6da52f78d895107f6c;hpb=f06c5f78733790aa5888510bd97b198a4278e826;p=quix0rs-gnu-social.git

diff --git a/actions/allrss.php b/actions/allrss.php
index bacb343ce0..885a67f618 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Public RSS action class.
+ * RSS feed for user and friends timeline action class.
  *
  * PHP version 5
  *
@@ -13,7 +13,7 @@
  * @link     http://laconi.ca/
  *
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -49,16 +49,18 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  */
 class AllrssAction extends Rss10Action
 {
-
     var $user = null;
 
     /**
      * Initialization.
-     * 
+     *
+     * @param array $args Web and URL arguments
+     *
      * @return boolean false if user doesn't exist
      */
-    function init()
+    function prepare($args)
     {
+        parent::prepare($args);
         $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
 
@@ -79,9 +81,18 @@ class AllrssAction extends Rss10Action
      */
     function getNotices($limit=0)
     {
-        $user   = $this->user;
-        $notice = $user->noticesWithFriends(0, $limit);
-                                            
+        $cur = common_current_user();
+
+        if (!empty($cur) && $cur->id == $user->id) {
+            $notice = $this->user->noticeInbox(0, $limit);
+        } else {
+            $notice = $this->user->noticesWithFriends(0, $limit);
+        }
+
+        $user    = $this->user;
+        $notice  = $user->noticesWithFriends(0, $limit);
+        $notices = array();
+
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -104,7 +115,8 @@ class AllrssAction extends Rss10Action
                    'link' => common_local_url('all',
                                              array('nickname' =>
                                                    $user->nickname)),
-                   'description' => sprintf(_('Feed for friends of %s'), $user->nickname));
+                   'description' => sprintf(_('Feed for friends of %s'),
+                                            $user->nickname));
         return $c;
     }