golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify caption cleanup callbacks; if the function was called we know that the 0 index is set. See #20369. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
duck_ 2012-04-06 19:52:34 +00:00
parent 2bca2af5fd
commit 1480a33d25
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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