Merge branch 'fixes/type-hints' into social-master

diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index 3106359b73525c233bde1fc69422f28b1126be7d..e56999283c89bb9df03b3d8ce98c18f6172684c3 100644 (file)
--- 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;