Changeset 20381

Timestamp:

04/06/2012 07:52:34 PM (14 years ago)

Author:

duck_

Message:

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

File:

• trunk/wp-admin/includes/media.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -166 +166 @@
 
 // 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] );
 }