Index: og.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og/Attic/og.module,v
retrieving revision 1.628.4.34
diff -u -p -r1.628.4.34 og.module
--- og.module	21 Feb 2010 17:32:35 -0000	1.628.4.34
+++ og.module	17 May 2010 20:43:34 -0000
@@ -472,10 +472,7 @@ function og_init() {
 
   // Set group context and language if needed.
   if ($group_node = og_determine_context()) {
-    og_set_theme($group_node);
     og_set_group_context($group_node);
-    // TODOL: is this too late for menu links and such?
-    og_set_language($group_node);
   }
 }
 
@@ -676,6 +673,9 @@ function og_set_group_context($node = NU
 
   if (!empty($node) && og_is_group_type($node->type)) {
     $stored_group_node = $node;
+    og_set_theme($node);
+    // TODOL: is this too late for menu links and such?
+    og_set_language($node);
   }
   return !empty($stored_group_node) ? $stored_group_node : NULL;
 }