Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.893 diff -u -p -r1.893 common.inc --- includes/common.inc 7 May 2009 15:29:07 -0000 1.893 +++ includes/common.inc 8 May 2009 14:50:46 -0000 @@ -1873,6 +1873,7 @@ function drupal_page_footer() { module_implements(MODULE_IMPLEMENTS_WRITE_CACHE); _registry_check_code(REGISTRY_WRITE_LOOKUP_CACHE); + drupal_cache_system_paths(); } /** Index: includes/path.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/path.inc,v retrieving revision 1.35 diff -u -p -r1.35 path.inc --- includes/path.inc 7 May 2009 15:49:57 -0000 1.35 +++ includes/path.inc 8 May 2009 14:50:46 -0000 @@ -49,6 +49,8 @@ function drupal_lookup_path($action, $pa $map = &drupal_static(__FUNCTION__, array()); $no_src = &drupal_static(__FUNCTION__ . ':no_src', array()); $count = &drupal_static(__FUNCTION__ . ':count'); + $system_paths = &drupal_static(__FUNCTION__ . ':system_paths'); + $no_aliases = &drupal_static(__FUNCTION__ . ':no_alias', array()); $path_language = $path_language ? $path_language : $language->language; @@ -61,19 +63,47 @@ function drupal_lookup_path($action, $pa $map = array(); $no_src = array(); $count = NULL; + $system_paths = array(); + $no_aliases = array(); } elseif ($count > 0 && $path != '') { if ($action == 'alias') { + // During the first call to drupal_lookup_path() per language, load the + // expected system paths for the page from cache. + if (!isset($map[$path_language])) { + $map[$path_language] = array(); + // Load system paths from cache. + $cid = 'path:system:' . current_path(); + if ($cache = cache_get($cid, 'cache_path')) { + $system_paths = $cache->data; + // Now fetch the aliases corresponding to these system paths. + // We order by ASC and overwrite array keys to ensure the correct + // alias is used when there are multiple aliases per path. + $result = db_query("SELECT src, dst FROM {url_alias} WHERE src IN(:system) AND language IN(:language, '') ORDER BY language ASC", array( + ':system' => $system_paths, + ':language' => $path_language)); + foreach ($result as $record) { + $map[$path_language][$record->src] = $record->dst; + } + // Keep a record of paths with no alias to avoid querying twice. + $no_aliases[$path_language] = array_flip(array_diff_key($system_paths, array_keys($map[$path_language]))); + } + } + // If the alias has already been loaded, return it. if (isset($map[$path_language][$path])) { return $map[$path_language][$path]; } - // Get the most fitting result falling back with alias without language - $alias = db_query("SELECT dst FROM {url_alias} WHERE src = :src AND language IN(:language, '') ORDER BY language DESC", array( - ':src' => $path, - ':language' => $path_language)) - ->fetchField(); - $map[$path_language][$path] = $alias; - return $alias; + // For system paths which were not cached, query aliases individually. + // individually. + else if (!isset($no_aliases[$path_language][$path])) { + // Get the most fitting result falling back with alias without language + $alias = db_query("SELECT dst FROM {url_alias} WHERE src = :src AND language IN(:language, '') ORDER BY language DESC", array( + ':src' => $path, + ':language' => $path_language)) + ->fetchField(); + $map[$path_language][$path] = $alias; + return $alias; + } } // Check $no_src for this $path in case we've already determined that there // isn't a path that has this alias @@ -103,6 +133,33 @@ function drupal_lookup_path($action, $pa } /** + * Cache system paths for a page. + * + * Cache an array of the system paths available on each page. We assume that + * expect that aiases will be needed for the majority of these paths during + * subsequent requests, and load them in a single query during + * drupal_lookup_path(). + */ +function drupal_cache_system_paths() { + // Check if the system paths for this page were loaded from cache in this + // request to avoid writing to cache on every request. + $system_paths = &drupal_static('drupal_lookup_path:system_paths', array()); + if (!$system_paths) { + // The static $map array used by drupal_lookup_path() includes all + // system paths for the page request. + $map = &drupal_static('drupal_lookup_path', array()); + + // Generate a cache ID (cid) specific for this page. + $cid = 'path:system:' . current_path(); + if ($paths = current($map)) { + $data = array_keys($paths); + $expire = REQUEST_TIME + (60 * 60 * 24); + cache_set($cid, $data, 'cache_path', $expire); + } + } +} + +/** * Given an internal Drupal path, return the alias set by the administrator. * * If no path is provided, the function will return the alias of the current Index: modules/node/node.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v retrieving revision 1.45 diff -u -p -r1.45 node.admin.inc --- modules/node/node.admin.inc 26 Apr 2009 19:44:38 -0000 1.45 +++ modules/node/node.admin.inc 8 May 2009 14:50:47 -0000 @@ -620,7 +620,6 @@ function theme_node_admin_nodes($form) { } function node_multiple_delete_confirm(&$form_state, $nodes) { - $form['nodes'] = array('#prefix' => '