Changeset 30406

Timestamp:

11/20/2014 10:59:54 AM (10 years ago)

Author:

nacin

Message:

TinyMCE: fix image captions regexp when wpautop is disabled in wp_editor().

Merges [29730] to the 4.0 branch.

props azaozz.
fixes #29592.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (modified) (2 diffs)

branches/4.0/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -83 +83 @@
             }
 
-            out = b.replace( /<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi, function( a, b, c, caption ) {
+            out = b.replace( /\s*<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>\s*/gi, function( a, b, c, caption ) {
                 var id, classes, align, width;
 
@@ -117 +117 @@
             });
 
-            if ( out.indexOf('[caption') !== 0 ) {
+            if ( out.indexOf('[caption') === -1 ) {
                 // the caption html seems broken, try to find the image that may be wrapped in a link
                 // and may be followed by <p> with the caption text.