From: Roland Haeder Date: Fri, 12 Sep 2014 20:40:46 +0000 (+0200) Subject: Merge branch 'fixes/type-hints' into social-master X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=23fe24adefc7616f4d7b5314681d788475d85a4e;hp=457586edab7faad12f92be1dadb02be6a58133df;p=quix0rs-gnu-social.git Merge branch 'fixes/type-hints' into social-master --- diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php index 3106359b73..e56999283c 100644 --- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php +++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php @@ -193,9 +193,10 @@ class GroupPrivateMessagePlugin extends Plugin assert(is_callable(array($action, 'getGroup'))); $gps = null; + $group = $action->getGroup(); - if (!empty($action->getGroup())) { - $gps = Group_privacy_settings::getKV('group_id', $action->getGroup()->id); + if ($group instanceof User_group) { + $gps = Group_privacy_settings::getKV('group_id', $group->id); } $orig = null;