? i18n-ascii.txt
? patches
Index: pathauto_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/Attic/pathauto_node.inc,v
retrieving revision 1.47.2.3
diff -u -p -r1.47.2.3 pathauto_node.inc
--- pathauto_node.inc	31 Jul 2010 15:57:16 -0000	1.47.2.3
+++ pathauto_node.inc	8 Dec 2010 00:18:32 -0000
@@ -97,19 +97,12 @@ function node_pathauto_bulkupdate() {
 
   $count = 0;
   if (count($pattern_types)) {
-    $query = "SELECT n.nid, n.vid, n.type, n.title, n.uid, n.created, n.language, alias.src, alias.dst FROM {node} n LEFT JOIN {url_alias} alias ON CONCAT('node/', CAST(n.nid AS CHAR)) = alias.src WHERE alias.src IS NULL AND n.type IN (". db_placeholders($pattern_types, 'varchar') .')';
-    $result = db_query_range($query, $pattern_types, 0, variable_get('pathauto_max_bulk_update', 50));
+    $sql = "SELECT n.nid FROM {node} n LEFT JOIN {url_alias} ua ON CONCAT('node/', CAST(n.nid AS CHAR)) = ua.src WHERE ua.src IS NULL AND n.type IN (". db_placeholders($pattern_types, 'varchar') .')';
+    $query = db_query_range($sql, $pattern_types, 0, variable_get('pathauto_max_bulk_update', 50));
 
     $placeholders = array();
-    while ($node_ref = db_fetch_object($result)) {
-      $node = node_load($node_ref->nid, NULL, TRUE);
-      $node->src = $node_ref->src;
-      $node->dst = $node_ref->dst;
-      if (module_exists('taxonomy')) {
-        // Must populate the terms for the node here for the category
-        // placeholders to work
-        $node->taxonomy = array_keys(taxonomy_node_get_terms($node));
-      }
+    while ($nid = db_result($query)) {
+      $node = node_load($nid, NULL, TRUE);
       $placeholders = pathauto_get_placeholders('node', $node);
       $source = "node/$node->nid";
       if (pathauto_create_alias('node', 'bulkupdate', $placeholders, $source, $node->nid, $node->type, $node->language)) {
Index: pathauto_taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/Attic/pathauto_taxonomy.inc,v
retrieving revision 1.39.2.5
diff -u -p -r1.39.2.5 pathauto_taxonomy.inc
--- pathauto_taxonomy.inc	31 Jul 2010 15:57:16 -0000	1.39.2.5
+++ pathauto_taxonomy.inc	8 Dec 2010 00:18:32 -0000
@@ -57,6 +57,11 @@ function taxonomy_pathauto_bulkupdate() 
   // From all node types, only attempt to update those with patterns
   $pattern_vids = array();
   foreach (taxonomy_get_vocabularies() as $vid => $info) {
+    // Exclude forum module's vocabulary.
+    if ($vid == variable_get('forum_nav_vocabulary', '')) {
+      continue;
+    }
+
     $pattern = trim(variable_get('pathauto_taxonomy_'. $vid .'_pattern', ''));
 
     // If it's not set, check the default
@@ -67,26 +72,18 @@ function taxonomy_pathauto_bulkupdate() 
     }
     if (!empty($pattern)) {
       $pattern_vids[] = $vid;
-      if (empty($vid_where)) {
-        $vid_where = " AND (vid = '%s' ";
-      }
-      else {
-        $vid_where .= " OR vid = '%s'";
-      }
     }
   }
-  $vid_where .= ')';
-
-  // 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, description, 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;
-  $result = db_query_range($query, $query_args, 0, variable_get('pathauto_max_bulk_update', 50));
 
   $count = 0;
-  $placeholders = array();
-  while ($category = db_fetch_object($result)) {
-    $count += _taxonomy_pathauto_alias($category, 'bulkupdate');
+  if (!empty($pattern_vids)) {
+    $sql = "SELECT td.tid FROM {term_data} td LEFT JOIN {url_alias} ua ON CONCAT('taxonomy/term/', CAST(td.tid AS CHAR)) = ua.src WHERE ua.src IS NULL AND td.vid IN (" . db_placeholders($pattern_vids, 'int') . ")";
+    $query = db_query_range($sql, $pattern_vids, 0, variable_get('pathauto_max_bulk_update', 50));
+
+    while ($tid = db_result($query)) {
+      $term = taxonomy_get_term($tid);
+      $count += _taxonomy_pathauto_alias($term, 'bulkupdate');
+    }
   }
 
   drupal_set_message(format_plural($count,
@@ -156,13 +153,13 @@ function forum_pathauto($op) {
  */
 function forum_pathauto_bulkupdate() {
   $forum_vid = variable_get('forum_nav_vocabulary', '');
-  $query = "SELECT tid, vid, name, description, src, dst FROM {term_data} 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));
+  $sql = "SELECT td.tid FROM {term_data} td LEFT JOIN {url_alias} ua ON CONCAT('forum/', CAST(td.tid AS CHAR)) = ua.src WHERE ua.src IS NULL AND td.vid = %d";
+  $query = db_query_range($sql, $forum_vid, 0, variable_get('pathauto_max_bulk_update', 50));
 
   $count = 0;
-  $placeholders = array();
-  while ($category = db_fetch_object($result)) {
-    $count = _taxonomy_pathauto_alias($category, 'bulkupdate') + $count;
+  while ($tid = db_result($query)) {
+    $term = taxonomy_get_term($tid);
+    $count += _taxonomy_pathauto_alias($term, 'bulkupdate');
   }
 
   drupal_set_message(format_plural($count,
Index: pathauto_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/Attic/pathauto_user.inc,v
retrieving revision 1.28.2.4
diff -u -p -r1.28.2.4 pathauto_user.inc
--- pathauto_user.inc	31 Jul 2010 15:57:16 -0000	1.28.2.4
+++ pathauto_user.inc	8 Dec 2010 00:18:32 -0000
@@ -114,15 +114,16 @@ function contact_pathauto($op) {
  * Bulk generate aliases for all users without aliases.
  */
 function user_pathauto_bulkupdate() {
-  $query = "SELECT uid, name, src, dst FROM {users} LEFT JOIN {url_alias} ON CONCAT('user/', CAST(uid AS CHAR)) = src WHERE uid > 0 AND src IS NULL";
-  $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50));
+  $sql = "SELECT u.uid FROM {users} u LEFT JOIN {url_alias} ua ON CONCAT('user/', CAST(u.uid AS CHAR)) = ua.src WHERE u.uid > 0 AND ua.src IS NULL";
+  $query = db_query_range($sql, 0, variable_get('pathauto_max_bulk_update', 50));
 
   $count = 0;
   $placeholders = array();
-  while ($user = db_fetch_object($result)) {
-    $placeholders = pathauto_get_placeholders('user', $user);
-    $source = 'user/'. $user->uid;
-    if (pathauto_create_alias('user', 'bulkupdate', $placeholders, $source, $user->uid)) {
+  while ($uid = db_result($query)) {
+    $account = user_load($uid);
+    $placeholders = pathauto_get_placeholders('user', $account);
+    $source = 'user/'. $account->uid;
+    if (pathauto_create_alias('user', 'bulkupdate', $placeholders, $source, $account->uid)) {
       $count++;
     }
   }
@@ -136,15 +137,16 @@ function user_pathauto_bulkupdate() {
  * Bulk generate aliases for all blogs without aliases.
  */
 function blog_pathauto_bulkupdate() {
-  $query = "SELECT uid, name, src, dst FROM {users} LEFT JOIN {url_alias} ON CONCAT('blog/', CAST(uid AS CHAR)) = src WHERE uid > 0 AND src IS NULL";
-  $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50));
+  $sql = "SELECT u.uid FROM {users} u LEFT JOIN {url_alias} ua ON CONCAT('blog/', CAST(u.uid AS CHAR)) = ua.src WHERE u.uid > 0 AND ua.src IS NULL";
+  $query = db_query_range($sql, 0, variable_get('pathauto_max_bulk_update', 50));
 
   $count = 0;
   $placeholders = array();
-  while ($user = db_fetch_object($result)) {
-    $placeholders = pathauto_get_placeholders('user', $user);
-    $source = 'blog/'. $user->uid;
-    if (pathauto_create_alias('blog', 'bulkupdate', $placeholders, $source, $user->uid)) {
+  while ($uid = db_result($query)) {
+    $account = user_load($uid);
+    $placeholders = pathauto_get_placeholders('user', $account);
+    $source = 'blog/'. $account->uid;
+    if (pathauto_create_alias('blog', 'bulkupdate', $placeholders, $source, $account->uid)) {
       $count++;
     }
   }
@@ -160,15 +162,16 @@ function blog_pathauto_bulkupdate() {
 function tracker_pathauto_bulkupdate() {
   // We do the double CONCAT because Pgsql8.1 doesn't support more than three arguments to CONCAT
   // Hopefully some day we can remove that.
-  $query = "SELECT uid, name, src, dst FROM {users} LEFT JOIN {url_alias} ON CONCAT(CONCAT('user/', CAST(uid AS CHAR)), '/track') = src WHERE uid > 0 AND src IS NULL";
-  $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50));
+  $sql = "SELECT u.uid FROM {users} u LEFT JOIN {url_alias} ua ON CONCAT(CONCAT('user/', CAST(u.uid AS CHAR)), '/track') = ua.src WHERE u.uid > 0 AND ua.src IS NULL";
+  $query = db_query_range($sql, 0, variable_get('pathauto_max_bulk_update', 50));
 
   $count = 0;
   $placeholders = array();
-  while ($user = db_fetch_object($result)) {
-    $placeholders = pathauto_get_placeholders('user', $user);
-    $src = 'user/'. $user->uid .'/track';
-    if (pathauto_create_alias('tracker', 'bulkupdate', $placeholders, $src, $user->uid)) {
+  while ($uid = db_result($query)) {
+    $account = user_load($uid);
+    $placeholders = pathauto_get_placeholders('user', $account);
+    $src = 'user/'. $account->uid .'/track';
+    if (pathauto_create_alias('tracker', 'bulkupdate', $placeholders, $src, $account->uid)) {
       $count++;
     }
   }
@@ -182,15 +185,16 @@ function tracker_pathauto_bulkupdate() {
  * Bulk generate aliases for all users without aliases
  */
 function contact_pathauto_bulkupdate() {
-  $query = "SELECT uid, name, src, dst FROM {users} LEFT JOIN {url_alias} ON CONCAT(CONCAT('user/', CAST(uid AS CHAR)), '/contact') = src WHERE uid > 0 AND src IS NULL";
-  $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50));
+  $sql = "SELECT u.uid FROM {users} u LEFT JOIN {url_alias} ua ON CONCAT(CONCAT('user/', CAST(u.uid AS CHAR)), '/contact') = ua.src WHERE u.uid > 0 AND ua.src IS NULL";
+  $query = db_query_range($sql, 0, variable_get('pathauto_max_bulk_update', 50));
 
   $count = 0;
   $placeholders = array();
-  while ($user = db_fetch_object($result)) {
-    $placeholders = pathauto_get_placeholders('user', $user);
-    $source = 'user/'. $user->uid .'/contact';
-    if (pathauto_create_alias('contact', 'bulkupdate', $placeholders, $source, $user->uid)) {
+  while ($uid = db_result($query)) {
+    $account = user_load($uid);
+    $placeholders = pathauto_get_placeholders('user', $account);
+    $source = 'user/'. $account->uid .'/contact';
+    if (pathauto_create_alias('contact', 'bulkupdate', $placeholders, $source, $account->uid)) {
       $count++;
     }
   }