Changeset 16154

Timestamp:

11/02/2010 05:19:55 PM (15 years ago)

Author:

scribu

Message:

Introduce wp_basename() and use it for media handling. See #11887

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (2 diffs)
• media.php (modified) (6 diffs)

trunk/wp-includes/formatting.php

@@ -2845 +2845 @@
 
 /**
+ * i18n friendly version of basename()
+ *
+ * @since 3.1.0
+ *
+ * @param string $path A path.
+ * @param string $suffix If the filename ends in suffix this will also be cut off.
+ * @return string
+ */
+function wp_basename( $path, $suffix = '' ) {
+    return urldecode( basename( str_replace( '%2F', '/', urlencode( $path ) ), $suffix ) );
+}
+
+/**
  * Forever eliminate "Wordpress" from the planet (or at least the little bit we can influence).
  *
@@ -2851 +2864 @@
  * @since 3.0.0
  */
-
 function capital_P_dangit( $text ) {
     // Simple replacement for titles

trunk/wp-includes/media.php

@@ -138 +138 @@
     $width = $height = 0;
     $is_intermediate = false;
+    $img_url_basename = wp_basename($img_url);
 
     // plugins can use this to provide resize services
@@ -145 +146 @@
     // try for a new style intermediate size
     if ( $intermediate = image_get_intermediate_size($id, $size) ) {
-        $img_url = str_replace(basename($img_url), $intermediate['file'], $img_url);
+        $img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
         $width = $intermediate['width'];
         $height = $intermediate['height'];
@@ -153 +154 @@
         // fall back to the old thumbnail
         if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
-            $img_url = str_replace(basename($img_url), basename($thumb_file), $img_url);
+            $img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
             $width = $info[0];
             $height = $info[1];
@@ -437 +438 @@
     $dir = $info['dirname'];
     $ext = $info['extension'];
-    $name = basename($file, ".{$ext}");
+    $name = wp_basename($file, ".$ext");
+
     if ( !is_null($dest_path) and $_dest_path = realpath($dest_path) )
         $dir = $_dest_path;
@@ -486 +488 @@
             $resized_file = apply_filters('image_make_intermediate_size', $resized_file);
             return array(
-                'file' => basename( $resized_file ),
+                'file' => wp_basename( $resized_file ),
                 'width' => $info[0],
                 'height' => $info[1],
@@ -607 +609 @@
     if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
         $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
-        $src_file = $icon_dir . '/' . basename($src);
+        $src_file = $icon_dir . '/' . wp_basename($src);
         @list($width, $height) = getimagesize($src_file);
     }