Index: includes/path.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/path.inc,v retrieving revision 1.19.2.4 diff -u -p -r1.19.2.4 path.inc --- includes/path.inc 28 May 2010 15:12:04 -0000 1.19.2.4 +++ includes/path.inc 17 Jun 2010 21:44:42 -0000 @@ -74,11 +74,11 @@ function drupal_lookup_path($action, $pa // isn't a path that has this alias elseif ($action == 'source' && !isset($no_src[$path_language][$path])) { // Look for the value $path within the cached $map - $src = ''; if (!isset($map[$path_language]) || !($src = array_search($path, $map[$path_language]))) { // Get the most fitting result falling back with alias without language if ($src = db_result(db_query("SELECT src FROM {url_alias} WHERE dst = '%s' AND language IN('%s', '') ORDER BY language DESC, pid DESC", $path, $path_language))) { $map[$path_language][$src] = $path; + return $src; } else { // We can't record anything into $map because we do not have a valid @@ -87,7 +87,6 @@ function drupal_lookup_path($action, $pa $no_src[$path_language][$path] = TRUE; } } - return $src; } }