Index: hierarchical_select.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/hierarchical_select/hierarchical_select.module,v
retrieving revision 1.175
diff -u -r1.175 hierarchical_select.module
--- hierarchical_select.module	29 Sep 2009 14:13:46 -0000	1.175
+++ hierarchical_select.module	15 Oct 2009 08:30:08 -0000
@@ -1307,9 +1307,11 @@
  *   Select through _hierarchical_select_add_js_settings().
  */
 function _hierarchical_select_setup_js(&$form_state = NULL) {
+  global $language;
+	
   static $ran_once;
   static $js_settings_added;
-
+  
   $jquery_ui_components = array(
     'effects.core',
     'effects.drop',
@@ -1318,8 +1320,8 @@
   if (!$js_settings_added && isset($form_state)) {
     $url = base_path();
     $url .= variable_get('clean_url', 0) ? '' : 'index.php?q=';
-	if (module_exists('i18n') && i18n_get_lang() != i18n_default_language() && variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE) != "3") {
-       $url .= i18n_get_lang() .'/';
+	if (module_exists('i18n') && ($language->prefix != '') && variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE) != "3") {
+       $url .= $language->prefix .'/';
     }
 
     _hierarchical_select_add_js_settings(array('HierarchicalSelect' => array('basePath' => $url, 'getArguments' => drupal_query_string_encode($_GET, array('q')))), $form_state);