Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/CHANGELOG.txt,v
retrieving revision 1.44
diff -u -p -r1.44 CHANGELOG.txt
--- CHANGELOG.txt	6 Dec 2009 19:26:37 -0000	1.44
+++ CHANGELOG.txt	22 Dec 2009 14:55:51 -0000
@@ -6,6 +6,8 @@ OG User Roles x.x-x.x, xxxx-xx-xx
 
 OG User Roles 6.x-4.x, xxxx-xx-xx
 ---------------------------------
+#613530 by Gábor Hojtsy, miro_dietiker, sun: Fixed not respecting custom group
+  context.
 #632304 by pwolanin, sun: Fixed group role form deletes default admin roles.
 #632304 by sun: Fixed tests and added a new one for group administrators.
 #571306 by pwolanin: Fixed 'Configure roles' tab only visible on 'Add members'.
Index: og_user_roles.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og_user_roles/og_user_roles.module,v
retrieving revision 1.44
diff -u -p -r1.44 og_user_roles.module
--- og_user_roles.module	14 Nov 2009 00:22:31 -0000	1.44
+++ og_user_roles.module	22 Dec 2009 14:54:38 -0000
@@ -123,6 +123,17 @@ function og_user_roles_init() {
 
   // Try to determine group context using customized menu system functions.
   $group_node = og_user_roles_determine_context();
+
+  // If no group context could be determined, additionally check for a custom
+  // group context that might have been set via og_set_group_context() to allow
+  // for usage of extended context support in organic groups. Only modules that
+  // set a context before og_user_roles_init() runs will have an effect. Since
+  // og_user_roles module sets its weight to -1, other modules may have to align
+  // their module weights to be able to set a custom group context early enough.
+  if (!isset($group_node)) {
+    $group_node = og_get_group_context();
+  }
+
   // Assign additional user roles to current user (if any).
   og_user_roles_grant_roles($user, $group_node);
 }