Changeset 36569 for trunk/src/wp-includes/media.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/media.php (modified) (3 diffs)

trunk/src/wp-includes/media.php

@@ -904 +904 @@
 
 /**
- * Caches and returns the base URL of the uploads directory.
- *
- * @since 4.4.0
- * @access private
- *
- * @return string The base URL, cached.
- */
-function _wp_upload_dir_baseurl() {
-    static $baseurl = array();
-
-    $blog_id = get_current_blog_id();
-
-    if ( empty( $baseurl[$blog_id] ) ) {
-        $uploads_dir = wp_upload_dir();
-        $baseurl[$blog_id] = $uploads_dir['baseurl'];
-    }
-
-    return $baseurl[$blog_id];
-}
-
-/**
  * Get the image size as array from its meta data.
  *
@@ -1046 +1025 @@
     }
 
-    $image_baseurl = _wp_upload_dir_baseurl();
-    $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
+    $upload_dir = wp_get_upload_dir();
+    $image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname;
 
     /*
@@ -3740 +3719 @@
     global $wpdb;
 
-    $dir = wp_upload_dir();
+    $dir = wp_get_upload_dir();
     $path = $url;