Index: pathauto.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.inc,v
retrieving revision 1.38
diff -u -p -r1.38 pathauto.inc
--- pathauto.inc	20 May 2008 18:09:08 -0000	1.38
+++ pathauto.inc	24 May 2008 11:24:07 -0000
@@ -305,10 +305,10 @@ function pathauto_create_alias($module, 
   $separator = variable_get('pathauto_separator', '-');
   if (_pathauto_alias_exists($alias, $src, $language)) {
     $original_alias = $alias;
-    for ($i = 0; _pathauto_alias_exists(drupal_substr($alias, 0, $maxlength - strlen($i)) . $separator . $i, $src, $language); $i++) {
+    for ($i = 0; _pathauto_alias_exists(drupal_substr($alias, 0, $maxlength - drupal_strlen($i)) . $separator . $i, $src, $language); $i++) {
     }
     // Make room for the sequence number
-    $alias = drupal_substr($alias, 0, $maxlength - strlen($i));
+    $alias = drupal_substr($alias, 0, $maxlength - drupal_strlen($i));
     $alias = $alias . $separator . $i;
     // If verbose is on, alert the user why this happened
     if ($verbose) {
@@ -323,7 +323,7 @@ function pathauto_create_alias($module, 
 
   // Also create a related feed alias if requested, and if supported
   // by the module
-  if (strlen(variable_get('pathauto_'. $module .'_applytofeeds', ''))) {
+  if (drupal_strlen(variable_get('pathauto_'. $module .'_applytofeeds', ''))) {
     $feedappend = variable_get('pathauto_'. $module .'_applytofeeds', '');
 
     // For forums and taxonomies, the src doesn't always form the base of the rss feed (ie. image galleries)
@@ -395,7 +395,7 @@ function _pathauto_set_alias($src, $dst,
     path_set_alias($src, $dst, $pid, $language);
 
     if (variable_get('pathauto_update_action', 2) == 3 && function_exists('path_redirect_save')) {
-      if (isset($old_alias) && strlen($old_alias)) {
+      if (isset($old_alias) && drupal_strlen($old_alias)) {
         $save['path'] = $old_alias;
         $save['redirect'] = $src;
         $save['type'] = 301; //moved permanently
@@ -449,7 +449,7 @@ function pathauto_get_placeholders($type
 function pathauto_clean_token_values($full) {
   foreach ($full->values as $key => $value) {
     // If it's a "path" or "url friendly" token don't remove the "/" character
-    if (substr($full->tokens[$key], -4, 4) === 'path' || substr($full->tokens[$key], -8, 8) === 'path-raw' || substr($full->tokens[$key], -5, 5) === 'alias') {
+    if (drupal_substr($full->tokens[$key], -4, 4) === 'path' || drupal_substr($full->tokens[$key], -8, 8) === 'path-raw' || drupal_substr($full->tokens[$key], -5, 5) === 'alias') {
       $full->values[$key] = pathauto_cleanstring($value, FALSE);
     }
     else {