Changeset 36569 for trunk/src/wp-includes/post.php

Timestamp:

02/18/2016 12:23:04 AM (8 years ago)

Author:

azaozz

Message:

Replace wp_upload_dir() with the new wp_get_upload_dir() in all cases where a file is not being uploaded. Deprecate _wp_upload_dir_baseurl(), and replace it with wp_get_upload_dir().

See #34359.

File:

• trunk/src/wp-includes/post.php (modified) (4 diffs)

trunk/src/wp-includes/post.php

@@ -187 +187 @@
 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_get_upload_dir() ) && false === $uploads['error'] ) ) {
         $file = $uploads['basedir'] . "/$file";
-    if ( $unfiltered )
+    }
+
+    if ( $unfiltered ) {
         return $file;
+    }
 
     /**
@@ -249 +253 @@
     $new_path = $path;
 
-    $uploads = wp_upload_dir();
+    $uploads = wp_get_upload_dir();
     if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) {
             $new_path = str_replace( $uploads['basedir'], '', $new_path );
@@ -4848 +4852 @@
     do_action( 'deleted_post', $post_id );
 
-    $uploadpath = wp_upload_dir();
+    $uploadpath = wp_get_upload_dir();
 
     if ( ! empty($meta['thumb']) ) {
@@ -4965 +4969 @@
     $url = '';
     // Get attached file.
-    if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true) ) {
+    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_get_upload_dir() ) && false === $uploads['error'] ) {
             // Check that the upload base exists in the file location.
             if ( 0 === strpos( $file, $uploads['basedir'] ) ) {