From: Mikael Nordfeldth Date: Tue, 29 Jul 2014 22:21:00 +0000 (+0200) Subject: JOINs and FOLLOWs would have null titles in Activity representation of notices X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9018fd75c6808cab43be492aa7f9883bad6d6230;p=quix0rs-gnu-social.git JOINs and FOLLOWs would have null titles in Activity representation of notices --- diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php index 59fb674fba..0d8508e06d 100644 --- a/plugins/Activity/ActivityPlugin.php +++ b/plugins/Activity/ActivityPlugin.php @@ -311,9 +311,10 @@ class ActivityPlugin extends Plugin // FIXME: do something here break; case ActivityVerb::JOIN: - $mem = Group_member::getKV('uri', $stored->uri); - if (!empty($mem)) { + $mem = Group_member::getKV('uri', $stored->getUri()); + if ($mem instanceof Group_member) { $group = $mem->getGroup(); + $act->title = $stored->getTitle(); $act->objects = array(ActivityObject::fromGroup($group)); } break; @@ -322,9 +323,10 @@ class ActivityPlugin extends Plugin break; case ActivityVerb::FOLLOW: $sub = Subscription::getKV('uri', $stored->uri); - if (!empty($sub)) { + if ($sub instanceof Subscription) { $profile = Profile::getKV('id', $sub->subscribed); - if (!empty($profile)) { + if ($profile instanceof Profile) { + $act->title = $stored->getTitle(); $act->objects = array($profile->asActivityObject()); } }