Changeset 20174 for trunk/wp-admin/includes/media.php

Timestamp:

03/14/2012 09:53:11 PM (13 years ago)

Author:

azaozz

Message:

Add support for line breaks to the caption textareas, see #18311

File:

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

trunk/wp-admin/includes/media.php

@@ -145 +145 @@
     $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
-    if ( ! preg_match( '/width="([0-9]+)/', $html, $matches ) )
+    if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) )
         return $html;
 
     $width = $matches[1];
 
-    // look only for html tags with attributes
-    $caption = preg_replace_callback( '/<[a-zA-Z0-9]+ [^<>]+>/', '_cleanup_image_add_caption', $caption );
-    $caption = str_replace( '"', '&quot;', $caption );
+    $caption = str_replace( array("\r\n", "\r"), "\n", $caption);
+    $caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption );
+    $caption = preg_replace( '/\n+/', '<br />', str_replace('"', '&quot;', $caption) );
 
     $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
@@ -168 +168 @@
 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', $str[0] );
+        $s = preg_replace_callback( '/="[^"]+"/', '_cleanup_image_add_caption2', $s );
         return str_replace( '"', "'", $s );
     }
@@ -1543 +1545 @@
 <?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
         if ( f.caption.value ) {
-            caption = f.caption.value.replace(/<[a-zA-Z0-9]+ [^<>]+>/g, function(a){
-                a = a.replace(/="[^"]+"/, function(b){
+            caption = f.caption.value.replace(/\r\n|\r/g, '\n');
+            caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
+                a = a.replace(/[\r\n\t]+/, ' ').replace(/="[^"]+"/, function(b){
                     return b.replace(/'/g, '&#39;');
                 });
@@ -1550 +1553 @@
             });
 
-            caption = caption.replace(/"/g, '&quot;');
+            caption = caption.replace(/\n+/g, '<br />').replace(/"/g, '&quot;');
         }
 <?php } ?>