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

Fix second callback when filtering caption text for shortcode, props SergeyBiryukov, fixes #20369 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2012-04-06 17:38:49 +00:00
parent a64c918e67
commit 2441cb0cae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,9 +166,9 @@ add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
// Private, preg_replace callback used in image_add_caption() // Private, preg_replace callback used in image_add_caption()
function _cleanup_image_add_caption($str) { function _cleanup_image_add_caption($str) {
if ( isset($str[0]) ) { if ( isset( $str[0] ) ) {
// remove any line breaks from inside the tags // remove any line breaks from inside the tags
$s = preg_replace( '/[\r\n\t]+/', ' ', $str[0]); $s = preg_replace( '/[\r\n\t]+/', ' ', $str[0] );
// look for single quotes inside html attributes (for example in title) // look for single quotes inside html attributes (for example in title)
$s = preg_replace_callback( '/="[^"]+"/', '_cleanup_image_add_caption2', $s ); $s = preg_replace_callback( '/="[^"]+"/', '_cleanup_image_add_caption2', $s );
return str_replace( '"', "'", $s ); return str_replace( '"', "'", $s );
@ -179,7 +179,7 @@ function _cleanup_image_add_caption($str) {
// Private, preg_replace callback used in image_add_caption() // Private, preg_replace callback used in image_add_caption()
function _cleanup_image_add_caption2($str) { function _cleanup_image_add_caption2($str) {
return str_replace( "'", ''', $str ); return ( isset( $str[0] ) ) ? str_replace( "'", ''', $str[0] ) : '';
} }
/** /**