Index: domain_user_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain_user_default/domain_user_default.inc,v
retrieving revision 1.2.2.7
diff -u -r1.2.2.7 domain_user_default.inc
--- domain_user_default.inc	20 Oct 2008 16:18:09 -0000	1.2.2.7
+++ domain_user_default.inc	12 Feb 2009 17:14:14 -0000
@@ -12,13 +12,19 @@
  * Callback handler to set default domain
  * @param $domain_id - The id of the domain to set
  */
-function domain_user_default_set($domain_id) {
+function domain_user_default_set($domain_id, $node_id) {
   $domain = _domain_user_default_set($domain_id);
 
   if ($domain) {
-    global $language;
-    // Redirect to language specific front page.
-    $page_url = substr(url('<front>', array('language' => $language)), 1);
+    // If request originated from a node redirect user back to the node on the new domain
+    if (is_numeric($node_id) && $node_id > 0) {
+      $page_url = substr(url('node/'. $node_id), 1);
+    }
+    else {
+      global $language;
+      // Redirect to language specific front page.
+      $page_url = substr(url('<front>', array('language' => $language)), 1);
+    }
     drupal_goto(domain_get_path($domain) . $page_url);
   }
 }
Index: domain_user_default.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain_user_default/domain_user_default.module,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 domain_user_default.module
--- domain_user_default.module	20 Oct 2008 16:18:10 -0000	1.1.2.11
+++ domain_user_default.module	12 Feb 2009 17:10:35 -0000
@@ -57,7 +57,7 @@
   $menu['domain-user-default/set/%'] = array(
     'title' => 'Set default domain',
     'page callback' => 'domain_user_default_set',
-    'page arguments' => array(2),
+    'page arguments' => array(2, 3),
     'access arguments' => array('set own domain default'),
     'type' => MENU_CALLBACK,
     'file' => 'domain_user_default.inc',
Index: domain_user_default.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/domain_user_default/domain_user_default.theme.inc,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 domain_user_default.theme.inc
--- domain_user_default.theme.inc	11 Jul 2008 17:33:26 -0000	1.1.2.2
+++ domain_user_default.theme.inc	12 Feb 2009 17:12:21 -0000
@@ -12,9 +12,13 @@
  * behavior as well.
  */
 function theme_domain_user_default_default_domain($domain) {
+  $current_node_id = 0;
+  if (arg(0) == 'node' && is_numeric(arg(1))) {
+    $current_node_id = arg(1);
+  }
   // define ahah behavior
   $ahah_binding = array(
-    'url'   => url('domain-geolocalization/search/form/js'), // the json callback
+    'url'   => url('domain-geolocalization/search/form/js/'. $current_node_id), // the json callback
     'event' => 'click',
     'wrapper'  => 'domain-search', // define the id of the container into
                                    // which to dump the form
@@ -28,7 +32,7 @@
   drupal_add_js('misc/jquery.form.js');
   drupal_add_js('misc/ahah.js');
   drupal_add_js(array('ahah' => array('domain-user-default-change' => $ahah_binding)), 'setting');
-  
+
   // @todo this could also be done via thickbox or lightbox by adding the
   // appropriate class to the anchor tag.