Changeset 21822

Timestamp:

09/11/2012 10:06:49 PM (14 years ago)

Author:

nacin

Message:

Always return upload directory information from wp_upload_dir(), even if there is an error. Append the error to the array. see #19235.

Location:

trunk/wp-includes

Files:

• functions.php (modified) (2 diffs)
• post.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1468 +1468 @@
         }
 
-        $bdir = $dir;
-        $burl = $url;
+        $basedir = $dir;
+        $baseurl = $url;
 
         $subdir = '';
@@ -1484 +1484 @@
         $url .= $subdir;
 
-        $uploads = apply_filters( 'upload_dir', array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false ) );
+        $uploads = apply_filters( 'upload_dir',
+                array(
+                        'path'    => $dir,
+                        'url'     => $url,
+                        'subdir'  => $subdir,
+                        'basedir' => $basedir,
+                        'baseurl' => $baseurl,
+                        'error'   => false,
+                ) );
 
         // 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'] );
-                return array( 'error' => $message );
+                $uploads['error'] = $message;
         }
 

trunk/wp-includes/post.php

@@ -224 +224 @@
         $new_path = $path;
 
-        if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) {
-                if ( 0 === strpos($new_path, $uploads['basedir']) ) {
-                                $new_path = str_replace($uploads['basedir'], '', $new_path);
-                                $new_path = ltrim($new_path, '/');
-                }
+        $uploads = wp_upload_dir();
+        if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) {
+                        $new_path = str_replace( $uploads['basedir'], '', $new_path );
+                        $new_path = ltrim( $new_path, '/' );
         }