diff -wBurp /home/fantomas/trans/drupal-5.7/modules/blogapi/blogapi.module modules/blogapi/blogapi.module
--- /home/fantomas/trans/drupal-5.7/modules/blogapi/blogapi.module	2007-07-26 23:16:45.000000000 +0400
+++ modules/blogapi/blogapi.module	2008-07-04 10:59:47.000000000 +0400
@@ -355,7 +355,7 @@ function blogapi_metaweblog_new_media_ob
     return blogapi_error($user);
   }
 
-  $name = basename($file['name']);
+  $name = drupal_basename($file['name']);
   $data = $file['bits'];
 
   if (!$data) {
diff -wBurp /home/fantomas/trans/drupal-5.7/modules/color/color.module modules/color/color.module
--- /home/fantomas/trans/drupal-5.7/modules/color/color.module	2007-11-12 06:38:08.000000000 +0300
+++ modules/color/color.module	2008-07-04 10:59:41.000000000 +0400
@@ -258,7 +258,7 @@ function color_scheme_form_submit($form_
 
   // Copy over neutral images
   foreach ($info['copy'] as $file) {
-    $base = basename($file);
+    $base = drupal_basename($file);
     $source = $paths['source'] . $file;
     file_copy($source, $paths['target'] . $base);
     $paths['map'][$file] = $base;
@@ -397,7 +397,7 @@ function _color_render_images($theme, &$
   // Cut out slices.
   foreach ($info['slices'] as $file => $coord) {
     list($x, $y, $width, $height) = $coord;
-    $base = basename($file);
+    $base = drupal_basename($file);
     $image = $paths['target'] . $base;
 
     // Cut out slice.
diff -wBurp /home/fantomas/trans/drupal-5.7/modules/system/system.module modules/system/system.module
--- /home/fantomas/trans/drupal-5.7/modules/system/system.module	2008-01-29 03:00:44.000000000 +0300
+++ modules/system/system.module	2008-07-04 10:59:53.000000000 +0400
@@ -949,7 +949,7 @@ function system_theme_data() {
       }
       else {
         $template->template = TRUE;
-        $template->name = basename(dirname($template->filename));
+        $template->name = drupal_basename(dirname($template->filename));
         $template->owner = $engine->filename;
         $template->prefix = $engine->name;
 
@@ -963,7 +963,7 @@ function system_theme_data() {
     foreach (file_scan_directory(dirname($theme->filename), 'style.css$') as $style) {
       $style->style = TRUE;
       $style->template = isset($theme->template) ? $theme->template : FALSE;
-      $style->name = basename(dirname($style->filename));
+      $style->name = drupal_basename(dirname($style->filename));
       $style->owner = $theme->filename;
       $style->prefix = $theme->template ? $theme->prefix : $theme->name;
       // do not double-insert styles with theme files in their directory
@@ -1019,7 +1019,7 @@ function system_region_list($theme_key) 
     // File is an engine; include its regions.
     else if (strpos($theme->description, '.engine')) {
       include_once './'. $theme->description;
-      $theme_engine = basename($theme->description, '.engine');
+      $theme_engine = drupal_basename($theme->description, '.engine');
       $regions = function_exists($theme_engine .'_regions') ? call_user_func($theme_engine .'_regions') : array();
     }