Commit fb4c95eb authored by jacob.embree's avatar jacob.embree

Fix return value of og_get_groups_by_user() when $group_type is provided and results are empty

parent 28c2d66e
...@@ -3553,7 +3553,10 @@ function og_node_create_links($group_type, $gid, $field_name, $destination = NUL ...@@ -3553,7 +3553,10 @@ function og_node_create_links($group_type, $gid, $field_name, $destination = NUL
* types will be fetched. * types will be fetched.
* *
* @return * @return
* An array with the group IDs or an empty array. * If $group_type is provided then an array of group IDs matching the
* specified group type. If $group_type is not provided then an associative
* array is returned containing arrays of group IDs keyed by group type. If
* no results are found an empty array is returned.
*/ */
function og_get_groups_by_user($account = NULL, $group_type = NULL) { function og_get_groups_by_user($account = NULL, $group_type = NULL) {
if (empty($account)) { if (empty($account)) {
...@@ -3581,12 +3584,10 @@ function og_get_groups_by_user($account = NULL, $group_type = NULL) { ...@@ -3581,12 +3584,10 @@ function og_get_groups_by_user($account = NULL, $group_type = NULL) {
} }
} }
if (empty($group_type)) { if (isset($group_type)) {
return $gids; return isset($gids[$group_type]) ? $gids[$group_type] : array();
}
elseif (!empty($gids[$group_type])) {
return $gids[$group_type];
} }
return $gids;
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment