Index: i18nmenu_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/i18nmenu_node/i18nmenu_node.module,v
retrieving revision 1.9
diff -u -p -r1.9 i18nmenu_node.module
--- i18nmenu_node.module	30 Jul 2010 15:35:43 -0000	1.9
+++ i18nmenu_node.module	12 Sep 2010 15:45:05 -0000
@@ -326,6 +326,15 @@ function i18nmenu_node_form_node_submit(
  */
 function i18nmenu_node_nodeapi(&$node, $op, $a3 = NULL, $page = NULL) {
   switch ($op) {
+    case 'presave':
+      // Ensure that the menu item language is always set to 'All languages' if
+      // node translation is enabled.
+      if (isset($node->menu) && !empty($node->menu['i18nmenu_node_translation'])) {
+        unset($node->menu['language']);
+        unset($node->menu['options']['langcode']);
+      }
+      break;
+
     case 'insert':
       if ($node->translation_source) {
         i18nmenu_node_item_translations_refresh_set(_i18nmenu_node_get_source_tnid($node));
@@ -494,31 +503,3 @@ function i18nmenu_node_get_translations(
     return $result;
   }
 }
-
-
-/**
- * @todo Backward compatibility code.
- * To be removed as soon as Internationalization 1.6 is released.
- */
-
-/**
- * Helper function: load the menu item associated to the current node.
- */
-if (!function_exists('_i18nmenu_node_prepare')) {
-  function _i18nmenu_node_prepare($node) {
-    module_invoke('menu', 'nodeapi', $node, 'prepare');
-  }
-}
-
-/**
- * Helper function.
- */
-if (!function_exists('_i18nmenu_get_item_title')) {
-  function _i18nmenu_get_item_title($link, $update = FALSE, $langcode = NULL) {
-    $key = 'menu:item:'. $link['mlid'] .':title';
-    if ($update) {
-      i18nstrings_update($key, $link['link_title']);
-    }
-    return i18nstrings($key, $link['link_title'], $langcode);
-  }
-}