_wp_get_attachment_relative_path uses hardcoded uploads directory path

[nedga055]

I'm using a theme that in turn uses the _wp_get_attachment_relative_path to help generate paths to uploaded images.

However, because my WordPress install changes the uploads directory path, the function returns the file system path for the attachment rather than then relative path within the uploads directory as expected, which ultimately breaks the intended functionality.

In _wp_get_attachment_relative_path, would it make sense to do something like the following instead of hard coding 'wp-content/uploads':

$uploads_dir = wp_upload_dir();
$uploads_basedir = $uploads_dir['basedir'];
if ( false !== strpos( $dirname, $uploads_basedir ) ) {
	// Get the directory name relative to the upload directory (back compat for pre-2.7 uploads)
	$dirname = substr( $dirname, strpos( $dirname, $uploads_basedir ) + strlen($uploads_basedir) );
	$dirname = ltrim( $dirname, '/' );
}

The correct patch file