Changes in branches/3.4/wp-includes/functions.php [21146:21757]

File:

• branches/3.4/wp-includes/functions.php (modified) (2 diffs)

branches/3.4/wp-includes/functions.php

@@ -1487 +1487 @@
     // 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 );
         return array( 'error' => $message );
     }
@@ -1605 +1610 @@
     $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 );
     }