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

Use _callback, rather than an unhelpful 2, for a preg_replace callback function name. Add proper phpdoc. see #20369. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-04-06 20:05:31 +00:00
parent 1480a33d25
commit d5cc12048e
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,17 +164,27 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $
} }
add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); 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()
*
* @access private
* @since 3.4.0
*/
function _cleanup_image_add_caption( $matches ) { function _cleanup_image_add_caption( $matches ) {
// remove any line breaks from inside the tags // remove any line breaks from inside the tags
$s = preg_replace( '/[\r\n\t]+/', ' ', $matches[0] ); $s = preg_replace( '/[\r\n\t]+/', ' ', $matches[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_caption_callback', $s );
return str_replace( '"', "'", $s ); return str_replace( '"', "'", $s );
} }
// Private, preg_replace callback used in image_add_caption() /**
function _cleanup_image_add_caption2( $matches ) { * Private preg_replace callback used in _cleanup_image_add_caption()
*
* @access private
* @since 3.4.0
*/
function _cleanup_image_add_caption_callback( $matches ) {
return str_replace( "'", ''', $matches[0] ); return str_replace( "'", ''', $matches[0] );
} }