Changeset 20679 for trunk/wp-includes/media.php

Timestamp:

05/02/2012 01:14:52 AM (14 years ago)

Author:

azaozz

Message:

Change the image caption shortcode format to [caption ...]<a><img /></a> caption text + htmlcaption. That way HTML tags in captions are better supported and the shortcode wouldn't break when using the wrong quotes. Props sushkov, nacin, fixes #18311

File:

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

trunk/wp-includes/media.php

@@ -725 +725 @@
  */
 function img_caption_shortcode($attr, $content = null) {
+    // New-style shortcode with the caption inside the shortcode with the link and image tags.
+    if ( ! isset( $attr['caption'] ) ) {
+        if ( preg_match( '#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches ) ) {
+            $content = $matches[1];
+            $attr['caption'] = trim( $matches[2] );
+        }
+    }
 
     // Allow plugins/themes to override the default caption template.