Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Brion Vibber
2010-03-18 17:19:28 -07:00
14 changed files with 236 additions and 175 deletions

View File

@@ -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();