- Patch #358315 by neochief et al: drupal_lookup_path() not respects alias' order.

1 files changed, 14 insertions, 2 deletions

diff --git a/modules/system/system.install b/modules/system/system.install
index 1f535c586..1fe22718a 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1340,11 +1340,11 @@ function system_schema() {
       ),
     ),
     'unique keys' => array(
-      'dst_language' => array('dst', 'language'),
+      'dst_language_pid' => array('dst', 'language', 'pid'),
     ),
     'primary key' => array('pid'),
     'indexes' => array(
-      'src_language' => array('src', 'language'),
+      'src_language_pid' => array('src', 'language', 'pid'),
     ),
   );
 
@@ -3525,6 +3525,18 @@ function system_update_7024() {
   return $ret;
 }
 
+ /**
+  * Improve indexes on the {url_alias} table.
+  */
+function system_update_7025() {
+  $ret = array();
+  db_drop_index($ret, 'url_alias', 'src_language');
+  db_drop_index($ret, 'url_alias', 'dst_language');
+  db_add_index($ret, 'url_alias', 'dst_language_pid', array('dst', 'language', 'pid'));
+  db_add_index($ret, 'url_alias', 'src_language_pid', array('src', 'language', 'pid'));
+  return $ret;
+}
+
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.