Ticket #20369: 20369.patch

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]) ) {
+        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 );
                 return str_replace(     '"', "'", $s );
@@ -179 +179 @@
 
 // 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] ) : '';
 }
 
 /**