Merge pull request #124 from alex-bukach/7.x-2.x

Fixed #120: New member state is pending, should be active when added by admin
Gizra · Jan 28, 2017 · 4edaed4 · 4edaed4
2 parents 2ab92b1 + f9ab0c1
commit 4edaed4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/entityreference/behavior/OgBehaviorHandler.class.php b/plugins/entityreference/behavior/OgBehaviorHandler.class.php
@@ -123,7 +123,7 @@ public function OgMembershipCrud($entity_type, $entity, $field, $instance, $lang
       $gid = $item['target_id'];
 
       // Must provide correct state in the event that approval is required.
-      if (empty($item['state']) && $entity_type == 'user' && !og_user_access($group_type, $gid, 'subscribe without approval', $entity)) {
+      if (empty($item['state']) && $entity_type == 'user' && !og_user_access($group_type, $gid, 'subscribe without approval', $entity) && !og_user_access($group_type, $gid, 'administer group')) {
         $item['state'] = OG_STATE_PENDING;
       }
       elseif (empty($item['state']) || !in_array($gid, $diff['insert'])) {