diff --git a/og_vocab.module b/og_vocab.module index 54173ec..25240ed 100644 --- a/og_vocab.module +++ b/og_vocab.module @@ -1481,8 +1481,8 @@ function og_vocab_entity_delete($entity, $entity_type) { * Array keyed with the group type and group ID, if context found. */ function og_vocab_is_group_admin_context() { - if (strpos($_GET['q'], 'group/') === 0 && ($item = menu_get_item()) && !empty($item['map'][2])) { - return array('group_type' => $item['map'][1], 'gid' => $item['map'][2]); + if (strpos($_GET['q'], 'group/') === 0 && ($arg1 = arg(1)) && entity_get_info($arg1) && ($arg2 = arg(2)) && is_numeric($arg2)) { + return array('group_type' => $arg1, 'gid' => $arg2); } // Iterate over modules implementing context, and return early once