Changeset 23055

Timestamp:

12/05/2012 12:59:25 AM (12 years ago)

Author:

nacin

Message:

Fix inserting of multiple attachments with captions when the first attachment does not have a caption. props azaozz. fixes #22720.

Location:

trunk

Files:

• wp-admin/js/media-upload.js (modified) (1 diff)
• wp-includes/js/media-editor.js (modified) (1 diff)

trunk/wp-admin/js/media-upload.js

@@ -25 +25 @@
             ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
 
-        if ( h.indexOf('[caption') === 0 ) {
+        if ( h.indexOf('[caption') !== -1 ) {
             if ( ed.wpSetImgCaption )
                 h = ed.wpSetImgCaption(h);
-        } else if ( h.indexOf('[gallery') === 0 ) {
+        } else if ( h.indexOf('[gallery') !== -1 ) {
             if ( ed.plugins.wpgallery )
                 h = ed.plugins.wpgallery._do_gallery(h);

trunk/wp-includes/js/media-editor.js

@@ -353 +353 @@
                     ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
 
-                if ( h.indexOf('[caption') === 0 ) {
+                if ( h.indexOf('[caption') !== -1 ) {
                     if ( ed.wpSetImgCaption )
                         h = ed.wpSetImgCaption(h);
-                } else if ( h.indexOf('[gallery') === 0 ) {
+                } else if ( h.indexOf('[gallery') !== -1 ) {
                     if ( ed.plugins.wpgallery )
                         h = ed.plugins.wpgallery._do_gallery(h);