Changeset 36569

Timestamp:

02/18/2016 12:23:04 AM (11 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.

Location:

trunk/src

Files:

• wp-admin/includes/ms.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/media.php (modified) (3 diffs)
• wp-includes/post.php (modified) (4 diffs)

trunk/src/wp-admin/includes/ms.php

@@ -109 +109 @@
 
         if ( $drop ) {
-                $uploads = wp_upload_dir();
+                $uploads = wp_get_upload_dir();
 
                 $tables = $wpdb->tables( 'blog' );

trunk/src/wp-includes/comment.php

@@ -2206 +2206 @@
 
         //Do not search for a pingback server on our own uploads
-        $uploads_dir = wp_upload_dir();
+        $uploads_dir = wp_get_upload_dir();
         if ( 0 === strpos($url, $uploads_dir['baseurl']) )
                 return false;

trunk/src/wp-includes/deprecated.php

@@ -3717 +3717 @@
         return $text;
 }
+
+/**
+ * Returns the base URL of the uploads directory.
+ *
+ * @since 4.4.0
+ * @access private
+ * @deprecated 4.5.0
+ *
+ * @return string The base URL.
+ */
+function _wp_upload_dir_baseurl() {
+        $upload_dir = wp_get_upload_dir();
+        return $upload_dir['baseurl'];
+}

trunk/src/wp-includes/functions.php

@@ -1886 +1886 @@
                                 }
 
-                                $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
+                                $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), esc_html( $error_path ) );
                         }
 

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;
 

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'] ) ) {