Ticket #31066: 31066.diff

src/wp-includes/functions.php

@@ -1483 +1483 @@
 function wp_mkdir_p( $target ) {
         $wrapper = null;
 
+        // Allow plugins to override dir creation.
+        $override = apply_filters( 'wp_mkdir_p_override', null, $target );
+        if ( $override !== null )
+                return $override;
+
         // Strip the protocol.
         if( wp_is_stream( $target ) ) {
                 list( $wrapper, $target ) = explode( '://', $target, 2 );
@@ -1729 +1734 @@
  * @since 2.0.0
  *
  * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null.
+ * @param bool $mkdir Optional. Attempt to create uploads directory if it doesn't exist.
+ *
  * @return array See above for description.
  */
-function wp_upload_dir( $time = null ) {
+function wp_upload_dir( $time = null, $mkdir = true ) {
         $siteurl = get_option( 'siteurl' );
         $upload_path = trim( get_option( 'upload_path' ) );
 
@@ -1839 +1846 @@
                 ) );
 
         // Make sure we have an uploads directory.
-        if ( ! wp_mkdir_p( $uploads['path'] ) ) {
+        if ( $mkdir && ! wp_mkdir_p( $uploads['path'] ) ) {
                 if ( 0 === strpos( $uploads['basedir'], ABSPATH ) )
                         $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
                 else

src/wp-includes/post.php

@@ -186 +186 @@
 function get_attached_file( $attachment_id, $unfiltered = false ) {
         $file = get_post_meta( $attachment_id, '_wp_attached_file', true );
         // If the file is relative, prepend upload dir.
-        if ( $file && 0 !== strpos($file, '/') && !preg_match('|^.:\\\|', $file) && ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) )
+        if ( $file && 0 !== strpos( $file, '/' ) && !preg_match( '|^.:\\\|', $file ) && ( ( $uploads = wp_upload_dir( null, false ) ) && false === $uploads['error'] ) )
                 $file = $uploads['basedir'] . "/$file";
         if ( $unfiltered )
                 return $file;
@@ -5026 +5026 @@
         // Get attached file.
         if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true) ) {
                 // Get upload directory.
-                if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) {
+                if ( ( $uploads = wp_upload_dir( null, false ) ) && false === $uploads['error'] ) {
                         // Check that the upload base exists in the file location.
                         if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
                                 // Replace file location with url location.