? patches
Index: pathauto.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.inc,v
retrieving revision 1.56.2.36
diff -u -p -r1.56.2.36 pathauto.inc
--- pathauto.inc	12 Aug 2010 15:10:58 -0000	1.56.2.36
+++ pathauto.inc	18 Aug 2010 17:37:15 -0000
@@ -653,10 +653,10 @@ function pathauto_clean_token_values($fu
   foreach ($full->values as $key => $value) {
     // Only clean non-path tokens.
     $token = $full->tokens[$key];
-    if (!preg_match('/(path|alias|url|url-brief)(-raw)?$/', $token)) {
+    if (!preg_match('/(node-path|alias|url|url-brief)(-raw)?$/', $token)) {
       $replacements[$token] = pathauto_cleanstring($value);
     }
-    elseif (preg_match('/(bookpath|menupath)(-raw)?$/', $token)) {
+    elseif (preg_match('/(path)(-raw)?$/', $token)) {
       // A few tokens violate the path/path-raw naming convention and should
       // still have their segments cleaned using pathauto_cleanstring().
       $segments = explode('/', $value);
Index: pathauto.tokens.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/Attic/pathauto.tokens.inc,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 pathauto.tokens.inc
--- pathauto.tokens.inc	11 Aug 2010 19:30:27 -0000	1.1.2.10
+++ pathauto.tokens.inc	18 Aug 2010 17:37:15 -0000
@@ -83,13 +83,11 @@ function _pathauto_token_values($type, $
 
       // Tokens [catpath] and [catpath-raw].
       if (isset($object->tid)) {
-        module_load_include('inc', 'pathauto');
         $parents = taxonomy_get_parents_all($object->tid);
         $catpath = $catpath_raw = array();
         foreach ($parents as $parent) {
-          $term_name_cleaned = pathauto_cleanstring($parent->name);
-          array_unshift($catpath, check_plain($term_name_cleaned));
-          array_unshift($catpath_raw, $term_name_cleaned);
+          array_unshift($catpath, check_plain($parent->name));
+          array_unshift($catpath_raw, $parent->name);
         }
         $values[$label . 'path'] = implode('/', $catpath);
         $values[$label . 'path-raw'] = implode('/', $catpath_raw);