--- og_forum.module	2009-06-15 20:52:59.000000000 +1000
+++ og_forumnew.module	2009-07-10 10:34:15.000000000 +1000
@@ -45,6 +45,13 @@ function og_forum_menu() {
     'access arguments' => array('access content'),
     'type' => MENU_SUGGESTED_ITEM,
   );
+  $items['node/%og_forum_group_type/forum'] = array(
+    'title' => 'Forums',
+    'page callback' => 'og_forum_page',
+    'page arguments' => array(1),
+    'access callback'   => TRUE,
+    'type' => MENU_LOCAL_TASK
+  );
   $items['admin/og/og_forum'] = array(
     'title' => t('Organic groups forums'),
     'description' => t('Configure forums for organic groups'),
@@ -104,6 +111,19 @@ function og_forum_menu() {
   return $items;
 } // function og_forum_menu()
 
+function og_forum_group_type_load($nid) {
+  $node = node_load($nid);
+  if (og_is_group_type($node->type)) {
+    global $user;
+    $tid = og_forum_get_forum_container($nid);
+    if (og_forum_is_public($tid) || array_key_exists($nid, $user->og_groups) || $user->uid == 1 || user_access('administer forums'))
+      return $tid;
+    else
+      return FALSE;
+  }
+  return FALSE;
+}
+
 function og_forum_access_privileges_1 ($gid) {
   $group = node_load($gid);
   $allow_public = variable_get('forum_allow_public', 0);	
