HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call shortcode functions directly. props kovshenin, fixes #24505.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@24547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin
2013-07-03 20:19:00 +00:00
parent 585eda125a
commit 6500a24719
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/includes/media.php
View File

@@ -2357,7 +2357,7 @@ function edit_form_image_editor( $post ) {
<?php
elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'audio/' ) ):
echo do_shortcode( '[audio src="' . $att_url . '"]' );
echo wp_audio_shortcode( array( 'src' => $att_url ) );
elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'video/' ) ):
@@ -2369,12 +2369,15 @@ function edit_form_image_editor( $post ) {
if ( $h && $w < $meta['width'] )
$h = round( ( $meta['height'] * $w ) / $meta['width'] );
$shortcode = sprintf( '[video src="%s"%s%s]',
$att_url,
empty( $meta['width'] ) ? '' : sprintf( ' width="%d"', $w ),
empty( $meta['height'] ) ? '' : sprintf( ' height="%d"', $h )
);
echo do_shortcode( $shortcode );
$attr = array( 'src' => $att_url );
if ( ! empty( $meta['width' ] ) )
$attr['width'] = $w;
if ( ! empty( $meta['height'] ) )
$attr['height'] = $h;
echo wp_video_shortcode( $attr );
endif; ?>
</div>