WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: In `wp_ajax_send_attachment_to_editor()`, the fallback logic for `$html` should be tucked into an `else` statement so it isn't run needlessly and overwritten. 

Props tychay.
Fixes #32072.

Built from https://develop.svn.wordpress.org/trunk@34260


git-svn-id: http://core.svn.wordpress.org/trunk@34224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-17 05:55:25 +00:00
parent 63efd92b11
commit f3dd19c6e2
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/includes/ajax-actions.php
View File

@ -2491,13 +2491,10 @@ function wp_ajax_send_attachment_to_editor() {
} }
} }
$rel = $url = ''; $rel = '';
$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : ''; $url = empty( $attachment['url'] ) ? '' : $attachment['url'];
if ( ! empty( $attachment['url'] ) ) { if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ) {
$url = $attachment['url'];
if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url )
$rel = ' rel="attachment wp-att-' . $id . '"'; $rel = ' rel="attachment wp-att-' . $id . '"';
$html = '<a href="' . esc_url( $url ) . '"' . $rel . '>' . $html . '</a>';
} }
remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' ); remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' );
@ -2514,9 +2511,14 @@ function wp_ajax_send_attachment_to_editor() {
} }
$title = ''; // We no longer insert title tags into <img> tags, as they are redundant. $title = ''; // We no longer insert title tags into <img> tags, as they are redundant.
$html = get_image_send_to_editor( $id, $caption, $title, $align, $url, (bool) $rel, $size, $alt ); $html = get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt );
} elseif ( wp_attachment_is( 'video', $post ) || wp_attachment_is( 'audio', $post ) ) { } elseif ( wp_attachment_is( 'video', $post ) || wp_attachment_is( 'audio', $post ) ) {
$html = stripslashes_deep( $_POST['html'] ); $html = stripslashes_deep( $_POST['html'] );
} else {
$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
if ( ! empty( $url ) ) {
$html = '<a href="' . esc_url( $url ) . '"' . $rel . '>' . $html . '</a>';
}
} }
/** This filter is documented in wp-admin/includes/media.php */ /** This filter is documented in wp-admin/includes/media.php */

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34259'; $wp_version = '4.4-alpha-34260';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.