diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-04 07:00:45 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-04 07:00:45 -0800 |
commit | 62d5f1addb1b710a387f7732ace1dd33bd1b86c1 (patch) | |
tree | df1d6d402dd057c330b0eb71b803d595c024d476 /actions/allrss.php | |
parent | 0f1c6e239acbf2c024c3aae9819d891f02b05bfd (diff) | |
parent | 9f861e9d895325adbb2dc7f1d540a442be2c1b2f (diff) |
Merge branch 'testing'
Diffstat (limited to 'actions/allrss.php')
-rw-r--r-- | actions/allrss.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/allrss.php b/actions/allrss.php index 28b1be27d..01e737ad7 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -83,6 +83,7 @@ class AllrssAction extends Rss10Action function getNotices($limit=0) { $cur = common_current_user(); + $user = $this->user; if (!empty($cur) && $cur->id == $user->id) { $notice = $this->user->noticeInbox(0, $limit); @@ -90,7 +91,6 @@ class AllrssAction extends Rss10Action $notice = $this->user->noticesWithFriends(0, $limit); } - $user = $this->user; $notice = $user->noticesWithFriends(0, $limit); $notices = array(); |