diff --git a/og.module b/og.module index 23af037dd0e0428cd8b622462e5cdfecb137a6e8..b798ea1b22cc49deb4e67b44f14ab1dc46647508 100755 --- a/og.module +++ b/og.module @@ -3561,18 +3561,18 @@ function og_get_groups_by_user($account = NULL, $group_type = NULL) { $account = $user; } + $gids = array(); + if (!og_get_group_audience_fields()) { // User entity doesn't have group audience fields. - return; + return $gids; } - $gids = array(); - // Get all active OG membership that belong to the user. $wrapper = entity_metadata_wrapper('user', $account->uid); $og_memberships = $wrapper->{'og_membership__' . OG_STATE_ACTIVE}->value(); if (!$og_memberships) { - return; + return $gids; } foreach ($og_memberships as $og_membership) { diff --git a/plugins/entityreference/selection/OgSelectionHandler.class.php b/plugins/entityreference/selection/OgSelectionHandler.class.php index d66bad3b1140b4f10f4905f9d7d5300b3636f66f..cebdf6579ee394ced66b78ce760f9d588b0f2ee1 100644 --- a/plugins/entityreference/selection/OgSelectionHandler.class.php +++ b/plugins/entityreference/selection/OgSelectionHandler.class.php @@ -105,7 +105,6 @@ class OgSelectionHandler extends EntityReference_SelectionHandler_Generic { $field_mode = $this->instance['field_mode']; $user_groups = og_get_groups_by_user(NULL, $group_type); - $user_groups = $user_groups ? $user_groups : array(); $user_groups = array_merge($user_groups, $this->getGidsForCreate());