Changeset 36569
- Timestamp:
- 02/18/2016 12:23:04 AM (9 years ago)
- Location:
- trunk/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/ms.php
r36505 r36569 109 109 110 110 if ( $drop ) { 111 $uploads = wp_ upload_dir();111 $uploads = wp_get_upload_dir(); 112 112 113 113 $tables = $wpdb->tables( 'blog' ); -
trunk/src/wp-includes/comment.php
r36566 r36569 2206 2206 2207 2207 //Do not search for a pingback server on our own uploads 2208 $uploads_dir = wp_ upload_dir();2208 $uploads_dir = wp_get_upload_dir(); 2209 2209 if ( 0 === strpos($url, $uploads_dir['baseurl']) ) 2210 2210 return false; -
trunk/src/wp-includes/deprecated.php
r36416 r36569 3717 3717 return $text; 3718 3718 } 3719 3720 /** 3721 * Returns the base URL of the uploads directory. 3722 * 3723 * @since 4.4.0 3724 * @access private 3725 * @deprecated 4.5.0 3726 * 3727 * @return string The base URL. 3728 */ 3729 function _wp_upload_dir_baseurl() { 3730 $upload_dir = wp_get_upload_dir(); 3731 return $upload_dir['baseurl']; 3732 } -
trunk/src/wp-includes/functions.php
r36565 r36569 1886 1886 } 1887 1887 1888 $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path);1888 $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), esc_html( $error_path ) ); 1889 1889 } 1890 1890 -
trunk/src/wp-includes/media.php
r36517 r36569 904 904 905 905 /** 906 * Caches and returns the base URL of the uploads directory.907 *908 * @since 4.4.0909 * @access private910 *911 * @return string The base URL, cached.912 */913 function _wp_upload_dir_baseurl() {914 static $baseurl = array();915 916 $blog_id = get_current_blog_id();917 918 if ( empty( $baseurl[$blog_id] ) ) {919 $uploads_dir = wp_upload_dir();920 $baseurl[$blog_id] = $uploads_dir['baseurl'];921 }922 923 return $baseurl[$blog_id];924 }925 926 /**927 906 * Get the image size as array from its meta data. 928 907 * … … 1046 1025 } 1047 1026 1048 $ image_baseurl = _wp_upload_dir_baseurl();1049 $image_baseurl = trailingslashit( $ image_baseurl) . $dirname;1027 $upload_dir = wp_get_upload_dir(); 1028 $image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname; 1050 1029 1051 1030 /* … … 3740 3719 global $wpdb; 3741 3720 3742 $dir = wp_ upload_dir();3721 $dir = wp_get_upload_dir(); 3743 3722 $path = $url; 3744 3723 -
trunk/src/wp-includes/post.php
r36566 r36569 187 187 function get_attached_file( $attachment_id, $unfiltered = false ) { 188 188 $file = get_post_meta( $attachment_id, '_wp_attached_file', true ); 189 189 190 // If the file is relative, prepend upload dir. 190 if ( $file && 0 !== strpos( $file, '/') && !preg_match('|^.:\\\|', $file) && ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) )191 if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) && ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) ) { 191 192 $file = $uploads['basedir'] . "/$file"; 192 if ( $unfiltered ) 193 } 194 195 if ( $unfiltered ) { 193 196 return $file; 197 } 194 198 195 199 /** … … 249 253 $new_path = $path; 250 254 251 $uploads = wp_ upload_dir();255 $uploads = wp_get_upload_dir(); 252 256 if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) { 253 257 $new_path = str_replace( $uploads['basedir'], '', $new_path ); … … 4848 4852 do_action( 'deleted_post', $post_id ); 4849 4853 4850 $uploadpath = wp_ upload_dir();4854 $uploadpath = wp_get_upload_dir(); 4851 4855 4852 4856 if ( ! empty($meta['thumb']) ) { … … 4965 4969 $url = ''; 4966 4970 // Get attached file. 4967 if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true ) ) {4971 if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true ) ) { 4968 4972 // Get upload directory. 4969 if ( ( $uploads = wp_upload_dir()) && false === $uploads['error'] ) {4973 if ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) { 4970 4974 // Check that the upload base exists in the file location. 4971 4975 if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
Note: See TracChangeset
for help on using the changeset viewer.