- Patch #196862 by catch: rolled back path optimization as it broke certain tests.

1 files changed, 7 insertions, 2 deletions

diff --git a/includes/path.inc b/includes/path.inc
index fd1e3448d..617e69a23 100644
--- a/includes/path.inc
+++ b/includes/path.inc
@@ -46,15 +46,20 @@ function drupal_init_path() {
 function drupal_lookup_path($action, $path = '', $path_language = '') {
   global $language;
   // $map is an array with language keys, holding arrays of Drupal paths to alias relations
-  static $map = array(), $no_src = array();
+  static $map = array(), $no_src = array(), $count;
 
   $path_language = $path_language ? $path_language : $language->language;
 
+  // Use $count to avoid looking up paths in subsequent calls if there simply are no aliases
+  if (!isset($count)) {
+    $count = db_result(db_query('SELECT COUNT(pid) FROM {url_alias}'));
+  }
+
   if ($action == 'wipe') {
     $map = array();
     $no_src = array();
   }
-  elseif (module_exists('path') && $path != '') {
+  elseif ($count > 0 && $path != '') {
     if ($action == 'alias') {
       if (isset($map[$path_language][$path])) {
         return $map[$path_language][$path];