Changeset 22276

Timestamp:

10/23/2012 01:49:00 PM (14 years ago)

Author:

ryan

Message:

A more generic message for wp_upload_dir(). Props nacin. fixes #21796

Location:

trunk

Files:

• . (modified) (1 prop)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -1571 +1571 @@
         // Make sure we have an uploads dir
         if ( ! wp_mkdir_p( $uploads['path'] ) ) {
-                $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $uploads['path'] );
+                if ( 0 === strpos( $uploads['basedir'], ABSPATH ) )
+                        $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+                else
+                        $error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+
+                $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
                 $uploads['error'] = $message;
         }
@@ -1689 +1694 @@
         $new_file = $upload['path'] . "/$filename";
         if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-                $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), dirname( $new_file ) );
+                if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
+                        $error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+                else
+                        $error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+
+                $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
                 return array( 'error' => $message );
         }