diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-18 17:19:28 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-18 17:19:28 -0700 |
| commit | 3e2e88b0dfb0f5b3baa336a9b3f69e8e8244c8e6 (patch) | |
| tree | 7de5edd8b9c74d5a29f7443b1a52a269f5f9d6e3 /lib/activity.php | |
| parent | 9c5af9a38f82afee92a78303aaa4604794ef6866 (diff) | |
| parent | 01a1e882afeb78542b02e4643c5d8a2fa50c2206 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/activity.php')
| -rw-r--r-- | lib/activity.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/activity.php b/lib/activity.php index 4b724ee90..23cf50f70 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -723,7 +723,7 @@ class ActivityObject } } - static function fromNotice($notice) + static function fromNotice(Notice $notice) { $object = new ActivityObject(); @@ -737,7 +737,7 @@ class ActivityObject return $object; } - static function fromProfile($profile) + static function fromProfile(Profile $profile) { $object = new ActivityObject(); |