Changeset 20376

Timestamp:

04/06/2012 05:38:49 PM (13 years ago)

Author:

azaozz

Message:

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

File:

• trunk/wp-admin/includes/media.php (modified) (2 diffs)

trunk/wp-admin/includes/media.php

@@ -167 +167 @@
 // Private, preg_replace callback used in image_add_caption()
 function _cleanup_image_add_caption($str) {
-    if ( isset($str[0]) ) {
+    if ( isset( $str[0] ) ) {
         // 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)
         $s = preg_replace_callback( '/="[^"]+"/', '_cleanup_image_add_caption2', $s );
@@ -180 +180 @@
 // Private, preg_replace callback used in image_add_caption()
 function _cleanup_image_add_caption2($str) {
-    return str_replace( "'", ''', $str );
+    return ( isset( $str[0] ) ) ? str_replace( "'", ''', $str[0] ) : '';
 }