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.10
diff -u -p -r1.2.2.10 domain_user_default.inc
--- domain_user_default.inc	18 Nov 2010 01:39:08 -0000	1.2.2.10
+++ domain_user_default.inc	1 Dec 2010 16:51:11 -0000
@@ -10,21 +10,12 @@
 
 /**
  * Callback handler to set default domain
- * @param $domain_id - The id of the domain to set
+ * @param $domain_id - The id of the domain to set and redirect to.
  */
-function domain_user_default_set($domain_id, $node_id) {
+function domain_user_default_set($domain_id) {
   $domain = _domain_user_default_set($domain_id);
   if ($domain) {
-    // If request originated from a node page redirect user back to the node page 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);
+    drupal_goto(domain_get_uri($domain));
   }
 }
 
@@ -136,10 +127,8 @@ function domain_user_default_domain_swit
  */
 function domain_user_default_domain_switcher_form_submit($form, &$form_state) {
   $domain_id = $form_state['values']['domain_id'] == -1 ? 0 : $form_state['values']['domain_id'];
-  $domain = _domain_user_default_set($domain_id);
 
-  if ($domain) {
-    // goto new domain
-    drupal_goto(domain_get_uri($domain));
+  if ($domain_id) {
+    domain_user_default_set($domain_id);
   }
 }