Changeset 21822 for trunk/wp-includes/functions.php

Timestamp:

09/11/2012 10:06:49 PM (13 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.

File:

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

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;
     }