Changeset 11493

Timestamp:

05/30/2009 10:02:01 AM (16 years ago)

Author:

westi

Message:

Move the upload_dir filter before the directory is created so that plugins can have a better effect. Fixes #9973 props dd32.

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -2000 +2000 @@
     $url .= $subdir;
 
+    $uploads = apply_filters( 'upload_dir', array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false ) );
+
     // Make sure we have an uploads dir
-    if ( ! wp_mkdir_p( $dir ) ) {
-        $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $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 = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
-
-    return apply_filters( 'upload_dir', $uploads );
+    return $uploads;
 }