Index: pathauto_taxonomy.inc =================================================================== RCS file: /cvsroot/drupal-common/modules/contrib/pathauto/pathauto_taxonomy.inc,v retrieving revision 1.1.6.2 diff -u -p -r1.1.6.2 pathauto_taxonomy.inc --- pathauto_taxonomy.inc 22 Oct 2009 07:43:27 -0000 1.1.6.2 +++ pathauto_taxonomy.inc 3 Nov 2009 15:20:19 -0000 @@ -80,7 +80,7 @@ function taxonomy_pathauto_bulkupdate() // Exclude the forums and join all the args into one array so they can be passed to db_query $forum_vid[] = variable_get('forum_nav_vocabulary', ''); $query_args = array_merge($forum_vid, $pattern_vids); - $query = "SELECT tid, vid, name, src, dst FROM {term_data} LEFT JOIN {url_alias} ON CONCAT('taxonomy/term/', CAST(tid AS CHAR)) = src WHERE src IS NULL AND vid <> %d ". $vid_where; + $query = "SELECT t.tid, t.vid, t.name, t.language, src, dst FROM {term_data} as t LEFT JOIN {url_alias} ON CONCAT('taxonomy/term/', CAST(tid AS CHAR)) = src WHERE src IS NULL AND vid <> %d ". $vid_where; $result = db_query_range($query, $query_args, 0, variable_get('pathauto_max_bulk_update', 50)); $count = 0; @@ -109,13 +109,13 @@ function _taxonomy_pathauto_alias($categ // If we're in a forum vocabulary, also create a forum container, forum, or forum topic alias. if (module_exists('forum') && $forum_vid == (int)$category->vid) { $src = 'forum/'. $category->tid; - if (pathauto_create_alias('forum', $op, $placeholders, $src, $category->tid, $category->vid)) { + if (pathauto_create_alias('forum', $op, $placeholders, $src, $category->tid, $category->vid, $category->langauge)) { $count++; } } else { $src = taxonomy_term_path($category); - if (pathauto_create_alias('taxonomy', $op, $placeholders, $src, $category->tid, $category->vid)) { + if (pathauto_create_alias('taxonomy', $op, $placeholders, $src, $category->tid, $category->vid, $category->langauge)) { $count++; } } @@ -156,7 +156,7 @@ function forum_pathauto($op) { */ function forum_pathauto_bulkupdate() { $forum_vid = variable_get('forum_nav_vocabulary', ''); - $query = "SELECT tid, vid, name, src, dst FROM {term_data} LEFT JOIN {url_alias} ON CONCAT('forum/', CAST(tid AS CHAR)) = src WHERE vid = %d AND src IS NULL"; + $query = "SELECT t.tid, t.vid, t.name, t.language, src, dst FROM {term_data} as t LEFT JOIN {url_alias} ON CONCAT('forum/', CAST(tid AS CHAR)) = src WHERE vid = %d AND src IS NULL"; $result = db_query_range($query, $forum_vid, 0, variable_get('pathauto_max_bulk_update', 50)); $count = 0;