Fix second callback when filtering caption text for shortcode, props SergeyBiryukov, fixes #20369
git-svn-id: https://develop.svn.wordpress.org/trunk@20376 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
6e3ed8bbf9
commit
80df7fe2cf
|
@ -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] ) : '';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue