Index: sites/all/modules/contrib/domain_path/domain_path.module IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- sites/all/modules/contrib/domain_path/domain_path.module (revision 6e9c883af7f9526c06503e3b36a3775cfad58ade) +++ sites/all/modules/contrib/domain_path/domain_path.module (revision ) @@ -161,13 +161,13 @@ // requested URL, we might end up being unable to check if there is a path // alias matching the URL path. $path_language = $path_language ? $path_language : $language_url->language; - // If the alias has already been loaded, return it. - if (isset($cache['map'][$domain_id][$path_language][$path])) { - return $cache['map'][$domain_id][$path_language][$path]; - } // Lookup Drupal system path. if ($action == 'source') { + // If the alias has already been loaded, return it. + if (isset($cache['map']['source'][$domain_id][$path_language][$path])) { + return $cache['map']['source'][$domain_id][$path_language][$path]; + } // Check $cache['no_sources'] for this $path in case we've already determined that there // isn't a path that has this alias. if (!isset($cache['no_sources'][$domain_id][$path_language][$path])) { @@ -198,7 +198,7 @@ if ($source) {// Source was found, store and return it. - $cache['map'][$domain_id][$path_language][$path] = $source; + $cache['map']['source'][$domain_id][$path_language][$path] = $source; } else {// No source found store in no_sources for future lookups. $cache['no_sources'][$domain_id][$path_language][$path] = TRUE; @@ -209,6 +209,10 @@ } // Look up the domain specific alias. elseif ($action == 'alias') { + // If the alias has already been loaded, return it. + if (isset($cache['map']['alias'][$domain_id][$path_language][$path])) { + return $cache['map']['alias'][$domain_id][$path_language][$path]; + } // Check $cache['no_aliases'] for this $path in case we've already determined that there // isn't an alias for this path. if (!isset($cache['no_aliases'][$domain_id][$path_language][$path])) { @@ -232,7 +236,7 @@ } // Alias was found, store and return it. if ($alias) { - $cache['map'][$domain_id][$path_language][$path] = $alias; + $cache['map']['alias'][$domain_id][$path_language][$path] = $alias; } // No alias found store in no_aliases for future lookups. else {