Index: settings_custom_url.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/domain/settings_custom_url.inc,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 settings_custom_url.inc
--- settings_custom_url.inc	25 Jul 2008 17:50:45 -0000	1.1.2.3
+++ settings_custom_url.inc	1 Sep 2008 07:30:37 -0000
@@ -92,6 +92,32 @@
             if (isset($source)) {
               $seo = FALSE;
             }
+            if (module_exists('domain_prefix')) {
+              $domain_id = $domain[$nid]['domain_id']; 
+              $status = db_result(db_query("SELECT status FROM {domain_prefix} WHERE domain_id = %d AND tablename = 'url_alias'", $domain_id));
+              
+              if ($status && $status > DOMAIN_PREFIX_IGNORE) {
+
+                // $map[$domain_id] keys are Drupal paths and the values are the corresponding aliases
+                static $map = array(), $count = array();
+                $tablename = domain_prefix_string($domain_id) .'url_alias';
+
+                // Use $count[$domain_id] to avoid looking up paths in subsequent calls if there simply are no aliases
+                if (!isset($count[$domain_id])) {
+                  $count[$domain_id] = db_result(db_query('SELECT COUNT(pid) FROM {%s}', $tablename));
+                }
+                
+                if ($count[$domain_id] > 0 && $original_path != '') {
+                  if (isset($map[$domain_id][$original_path])) {
+                    $path = $map[$domain_id][$original_path];
+                  } else {
+                    $alias = db_result(db_query("SELECT dst FROM {%s} WHERE src = '%s'", $tablename, $original_path));
+                    $map[$domain_id][$original_path] = $alias;
+                    $path = $alias;
+                  }
+                }
+              }
+            }
           }
         }
         // If strict SEO rules are enabled, we set "all affiliate" links to the root domain.