Ticket #37183: 37183.patch

package.json

@@ -10 +10 @@
   "license": "GPL-2.0+",
   "devDependencies": {
     "autoprefixer": "~6.3.3",
-    "grunt": "~0.4.5",
+    "grunt": "^0.4.5",
     "grunt-browserify": "~5.0.0",
     "grunt-contrib-clean": "~1.0.0",
     "grunt-contrib-compress": "~1.1.0",

src/wp-includes/media.php

@@ -1458 +1458 @@
 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 ) ) {
+                $matches = array();
+                $regex = '#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is';
+                preg_match( $regex, $content, $matches );
+
+                /**
+                 * Filter the content and caption for use in the caption shortcode.
+                 *
+                 * If the filtered array `$matches` is empty, an old-style caption attribute
+                 * will be assumed.
+                 *
+                 * @since x.x.x
+                 *
+                 * @param array $matches        The default result of `preg_match`.
+                 * @param string $content       The content included in the caption shortcode (including the image).
+                 * @param string $regex         The regular expression capturing the image and the caption attribute.
+                 *
+                 * @return array $matches {
+                 *              Array corresponding to the result of `preg_match`.
+                 *
+                 *              @type string 1  The new `$content` used in the shortcode (i.e. the `<img>` tag).
+                 *              @type string 2  The caption (set as `$attr['caption']`.
+                 * }
+                 */
+                $matches = apply_filters( 'img_caption_shortcode_content', $matches, $content, $regex );
+
+                if ( ! empty ( $matches ) ) {
                         $content = $matches[1];
                         $attr['caption'] = trim( $matches[2] );
                 }