Changeset 36628 for trunk/src/wp-includes/functions.php

Timestamp:

02/23/2016 03:57:23 PM (9 years ago)

Author:

azaozz

Message:

In wp_upload_dir() do not cache error from wp_mkdir_p() when a directory cannot be created. Keep trying to create the dirs. This happens mostly in file upload context.

See #34359.

File:

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

trunk/src/wp-includes/functions.php

@@ -1876 +1876 @@
         }
 
-        if ( array_key_exists( $path, $tested_paths ) ) {
-            $uploads['error'] = $tested_paths[ $path ];
-        } else {
+        if ( ! in_array( $path, $tested_paths, true ) ) {
             if ( ! wp_mkdir_p( $path ) ) {
                 if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
@@ -1887 +1885 @@
 
                 $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), esc_html( $error_path ) );
+            } else {
+                $tested_paths[] = $path;
+                wp_cache_set( 'upload_dir_tested_paths', $tested_paths );
             }
-
-            $tested_paths[ $path ] = $uploads['error'];
-            wp_cache_set( 'upload_dir_tested_paths', $tested_paths );
         }
     }