From 15153dd5d652d85fdcb6169bd9916a2e22f6ebd8 Mon Sep 17 00:00:00 2001 From: azaozz Date: Fri, 26 Dec 2008 02:59:04 +0000 Subject: [PATCH] Fix uploaded media relative links when site has been moved, props DD32, fixes #8705 for trunk git-svn-id: http://svn.automattic.com/wordpress/trunk@10254 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/post.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wp-includes/post.php b/wp-includes/post.php index 5528f48af..dd1e9c00f 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -741,7 +741,7 @@ function get_post_custom_keys( $post_id = 0 ) { function get_post_custom_values( $key = '', $post_id = 0 ) { $custom = get_post_custom($post_id); - return $custom[$key]; + return isset($custom[$key]) ? $custom[$key] : null; } /** @@ -2589,6 +2589,10 @@ function wp_get_attachment_url( $post_id = 0 ) { if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { //Get upload directory if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location + elseif ( false !== strpos($file, 'wp-content/uploads') ) + $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 ); + else + $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir. } }