diff --git a/og.module b/og.module index f2e3de7..54aa189 100644 --- a/og.module +++ b/og.module @@ -805,9 +805,11 @@ function og_set_group_context($node = NULL, $clear = FALSE) { // group. This covers the case when the site doesn't have a prefix for // the default language, particularly if the same node is posted in // multiple groups. - $current_node = menu_get_object(); - if (!$current_node || (!og_is_group_type($current_node->type) && $current_node->language == $node->og_language)) { - og_set_language($node); + if (isset($node->nid)) { + $current_node = menu_get_object('node', 1, 'node/' . $node->nid); + if (!$current_node || (!og_is_group_type($current_node->type) && $current_node->language == $node->og_language)) { + og_set_language($node); + } } } return !empty($stored_group_node) ? $stored_group_node : NULL;