diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-27 14:54:43 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-27 14:54:43 -0700 |
commit | 2f2fa100715f9c09b2b91a2d1afddacf7b7f16db (patch) | |
tree | 883a6642614484db322a3b6f17511c2ab5f46376 /lib/atomusernoticefeed.php | |
parent | 87b8a89aa7b96e63586bdd3b1afb9d43355fd48b (diff) | |
parent | 2b318a3420fe3e979defc7eacfb1eb2d9321d807 (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline into testingtesting
Diffstat (limited to 'lib/atomusernoticefeed.php')
-rw-r--r-- | lib/atomusernoticefeed.php | 5 |
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(); |