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

Fix the inserting of caption shortcode when the upload path contains "align" 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11462 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-05-26 22:33:02 +00:00
parent 93895989c8
commit 51e5201348
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,15 +130,20 @@ function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = fal
*/ */
function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) { function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html; if ( empty($alt) || apply_filters( 'disable_captions', '' ) )
return $html;
$id = ( 0 < (int) $id ) ? 'attachment_' . $id : ''; $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
preg_match( '/width="([0-9]+)/', $html, $matches ); preg_match( '/width="([0-9]+)/', $html, $matches );
if ( ! isset($matches[1]) ) return $html; if ( ! isset($matches[1]) )
return $html;
$width = $matches[1]; $width = $matches[1];
$html = preg_replace( '/align[^\s\'"]+\s?/', '', $html ); $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
if ( empty($align) ) $align = 'none'; if ( empty($align) )
$align = 'none';
$alt = ! empty($alt) ? addslashes($alt) : ''; $alt = ! empty($alt) ? addslashes($alt) : '';
@ -427,13 +432,35 @@ function media_upload_form_handler() {
if ( isset($send_id) ) { if ( isset($send_id) ) {
$attachment = stripslashes_deep( $_POST['attachments'][$send_id] ); $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
$html = $attachment['post_title']; $html = $attachment['post_title'];
if ( !empty($attachment['url']) ) { if ( !empty($attachment['url']) ) {
if ( strpos($attachment['url'], 'attachment_id') || false !== strpos($attachment['url'], get_permalink($_POST['post_id'])) ) if ( strpos($attachment['url'], 'attachment_id') || false !== strpos($attachment['url'], get_permalink($_POST['post_id'])) )
$rel = " rel='attachment wp-att-" . esc_attr($send_id)."'"; $rel = " rel='attachment wp-att-" . esc_attr($send_id)."'";
$html = "<a href='{$attachment['url']}'$rel>$html</a>"; $html = "<a href='{$attachment['url']}'$rel>$html</a>";
} }
$html = apply_filters('media_send_to_editor', $html, $send_id, $attachment); $html = apply_filters('media_send_to_editor', $html, $send_id, $attachment);
return media_send_to_editor($html); return media_send_to_editor($html);
} }