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

diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index d78ef79704f8b2347f02f809ea268f04a9220acc..9c9f6bf99c0a2ab14ed28ff1df2def808f80f67c 100644 (file)
--- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -190,9 +190,10 @@ class GroupPrivateMessagePlugin extends Plugin
     function onEndGroupSaveForm(GroupAction $action)
     {
         $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;