diff options
author | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
commit | ac609e804078cf70fcc02b36aa1eb40115354715 (patch) | |
tree | c206723a0fe28fd62f8d2838f589a42ec7523af5 /lib/activity.php | |
parent | 17c50f338ceb574780476f6b788f48e2d7d06017 (diff) | |
parent | 4a6c9e445149e42a4f81d5140296e7770c60bc6c (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
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 d84eabf7c..c67d090f7 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -720,7 +720,7 @@ class ActivityObject } } - static function fromNotice($notice) + static function fromNotice(Notice $notice) { $object = new ActivityObject(); @@ -734,7 +734,7 @@ class ActivityObject return $object; } - static function fromProfile($profile) + static function fromProfile(Profile $profile) { $object = new ActivityObject(); |