domain_path should only load paths when necessary.

If accepted we should probably call this 7.x-2.x as it changes around the core of domain_path.

Changed out domain_path_domain_path() to use the original_path when looking up an alias && return Drupal alias if we don't have one as it did before.

/**
 * Implements hook_domainpath().
 */
function domain_path_domain_path($domain_id, &$path, &$options, $original_path) {
  $path_language = isset($options['language']->language) ? $options['language']->language : NULL;
  if ($alias = domain_path_lookup_path('alias', $original_path, $domain_id, $path_language)) {
    $path = $alias;
    $options['alias'] = TRUE;
  }
  elseif($alias = drupal_get_path_alias($original_path)) {
    $path = $alias;
    $options['alias'] = TRUE;
  }
}

Forgot about the pathlanguage for the call to drupal_get_path_alias.

Had a notice on node/add for new nodes.

Maybe, but in most cases I would not think that an alias would be loaded for multiple domains on a page so it has the potential to load unnecessary data. With the domain switcher module && admin pages it will query the same path multiple times to get for each domain's alias and on node/edit but in other cases it should only be looking @ one domain -- right?

- edit
Thinking about this more it really would not be much more data assuming that only a subset of the domain paths are set.

Looking @ this further we should include the whitelist mechanism from drupal_lookup_path to account for system paths we should not care about.

Committed in fdf786a