summaryrefslogtreecommitdiff
path: root/lib/atomusernoticefeed.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-05-27 14:22:24 -0700
committerBrion Vibber <brion@pobox.com>2010-05-27 14:22:24 -0700
commit2b318a3420fe3e979defc7eacfb1eb2d9321d807 (patch)
tree1db2f9fdffd3bba88219e6822ec848790e08e9cd /lib/atomusernoticefeed.php
parent697a9948df3c9d4275b3525227007bfd5a1c5709 (diff)
parentc5b61078e1548fba2820620e2e8f5fcbbda611a8 (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/atomusernoticefeed.php')
-rw-r--r--lib/atomusernoticefeed.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 428cc2de2..b569d9379 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -50,13 +50,14 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
* Constructor
*
* @param User $user the user for the feed
+ * @param User $cur the current authenticated user, if any
* @param boolean $indent flag to turn indenting on or off
*
* @return void
*/
- function __construct($user, $indent = true) {
- parent::__construct($indent);
+ function __construct($user, $cur = null, $indent = true) {
+ parent::__construct($cur, $indent);
$this->user = $user;
if (!empty($user)) {
$profile = $user->getProfile();