diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2012-01-21 10:52:40 -0800 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-01-21 10:52:40 -0800 |
| commit | 8164434505e4292e5d584eebbf7b05b403d9c07b (patch) | |
| tree | 723b2507f6382b71902eb4bb7aa2a6c37a1e3c95 /modules/color | |
| parent | 283523192421f0708c01f7fa08d5814442c757a5 (diff) | |
| download | brdo-8164434505e4292e5d584eebbf7b05b403d9c07b.tar.gz brdo-8164434505e4292e5d584eebbf7b05b403d9c07b.tar.bz2 | |
Issue #278425 by andypost, droplet, OnkelTem, chx, c960657, drewish, kotnik, realityloop: Change notice for: Using basename() is not locale safe.
Diffstat (limited to 'modules/color')
| -rw-r--r-- | modules/color/color.module | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/color/color.module b/modules/color/color.module index 78e8766c6..c58d6ecce 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -96,7 +96,7 @@ function _color_html_alter(&$vars) { foreach ($color_paths as $color_path) { // Color module currently requires unique file names to be used, // which allows us to compare different file paths. - if (basename($old_path) == basename($color_path)) { + if (drupal_basename($old_path) == drupal_basename($color_path)) { // Replace the path to the new css file. // This keeps the order of the stylesheets intact. $vars['css'][$old_path]['data'] = $color_path; @@ -389,7 +389,7 @@ function color_scheme_form_submit($form, &$form_state) { // Copy over neutral images. foreach ($info['copy'] as $file) { - $base = basename($file); + $base = drupal_basename($file); $source = $paths['source'] . $file; $filepath = file_unmanaged_copy($source, $paths['target'] . $base); $paths['map'][$file] = $base; @@ -431,7 +431,7 @@ function color_scheme_form_submit($form, &$form_state) { // Rewrite stylesheet with new colors. $style = _color_rewrite_stylesheet($theme, $info, $paths, $palette, $style); - $base_file = basename($file); + $base_file = drupal_basename($file); $css[] = $paths['target'] . $base_file; _color_save_stylesheet($paths['target'] . $base_file, $style, $paths); } @@ -571,7 +571,7 @@ function _color_render_images($theme, &$info, &$paths, $palette) { // Cut out slices. foreach ($info['slices'] as $file => $coord) { list($x, $y, $width, $height) = $coord; - $base = basename($file); + $base = drupal_basename($file); $image = drupal_realpath($paths['target'] . $base); // Cut out slice. |