Index: og_menu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og_menu/og_menu.module,v
retrieving revision 1.1.6.12
diff -u -p -r1.1.6.12 og_menu.module
--- og_menu.module	9 Feb 2010 12:33:31 -0000	1.1.6.12
+++ og_menu.module	12 May 2010 23:40:27 -0000
@@ -119,7 +119,7 @@ function og_menu_theme($existing, $type,
  * Theme function for node form.
  */
 function theme_og_menu_node_form($form) {
-  $menus = og_menu_get_menus();
+  $menus = og_menu_get_custom_menus();
   foreach ($menus as $menu) {
     $settings[$menu['menu_name']] = $menu['gid'];
   }
@@ -147,7 +147,7 @@ function og_menu_block($op = 'list', $de
   }
   else if ($op == 'view' && $delta == 0) {
     $group = og_get_group_context();
-    $menus = og_menu_get_menus(array($group->nid));
+    $menus = og_menu_get_custom_menus(array($group->nid));
     $menu = array_shift($menus);
     return array('subject' => check_plain($menu['title']), 'content' => menu_tree($menu['menu_name']));
   }
@@ -169,7 +169,7 @@ function og_menu_block($op = 'list', $de
       $group = og_get_group_context();
       $gids = array($group->nid);
     }
-    $menus = og_menu_get_menus($gids);
+    $menus = og_menu_get_custom_menus($gids);
     foreach ($menus as $menu) {
       $block = new stdClass();
       $block->module = 'og_menu';
@@ -216,7 +216,7 @@ function og_menu_form_alter(&$form, $for
       $list = array();
       $settings = array();
       $item = $form['menu']['#item'];
-      $menus = og_menu_get_menus($groups);
+      $menus = og_menu_get_custom_menus($groups);
       
       if (!empty($menus)) {
         foreach ($menus as $menu) {
@@ -302,7 +302,7 @@ function og_menu_nodeapi(&$node, $op, $t
         break;
       case 'update':
         if ($node->og_menu) {
-          $menu = og_menu_get_menus(array($node->nid));
+          $menu = og_menu_get_custom_menus(array($node->nid));
           if (empty($menu)) {
             db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'menu-og-'. $node->nid, $node->title, t('Menu for') .' '. check_plain($node->title));
             og_menu_update_menu('menu-og-'. $node->nid, $node->nid);
@@ -314,7 +314,7 @@ function og_menu_nodeapi(&$node, $op, $t
         }
         break;
       case 'prepare':
-        $node->og_menu = og_menu_get_menus(array($node->nid));
+        $node->og_menu = og_menu_get_custom_menus(array($node->nid));
         break;
       case 'delete':
         db_query("DELETE FROM {menu_custom} WHERE menu_name = '%s'", 'menu-og-'. $node->nid);
@@ -441,7 +441,7 @@ function og_menu_edit_item_form(&$form_s
   module_load_include('inc', 'menu', 'menu.admin');
   $form = drupal_retrieve_form('menu_edit_item', $form_state, $type, $item, $menu);
   $list = array();
-  $menus = og_menu_get_menus(array($node->nid));
+  $menus = og_menu_get_custom_menus(array($node->nid));
   foreach ($menus as $menu) {
     $list[$menu['menu_name']] = $menu['title'];
   }
@@ -465,7 +465,7 @@ function og_menu_delete_item_form(&$form
 }
 
 function og_menu_node_form_validate($form, &$form_state) {
-  $menus = og_menu_get_menus();
+  $menus = og_menu_get_custom_menus();
   $parents = explode(':', $form_state['values']['menu']['parent']);
   $parent = $parents[0];
   $gids = array();
@@ -511,7 +511,7 @@ function og_menu_update_menu($menu_name,
  * @return
  *    A structured array with menus list.
  */
-function og_menu_get_menus($gids = NULL, $user = NULL) {
+function og_menu_get_custom_menus($gids = NULL, $user = NULL) {
   if (!$user) {
     global $user;
   }
@@ -572,4 +572,4 @@ function og_menu_redirect($form, &$form_
   $node = menu_get_object('node', 1);
   $menu = menu_get_object('menu', 3);
   $form_state['redirect'] = 'node/'. $node->nid .'/og_menu/'. $menu['menu_name'];
-}
\ No newline at end of file
+}