diff --git wp-includes/js/tinymce/plugins/wpeditimage/editimage.html wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
index d7ad227..5627ee2 100644
--- wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
+++ wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
@@ -103,7 +103,7 @@ if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
-
+
|
diff --git wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js
index f79b625..8e9ae90 100644
--- wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js
+++ wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js
@@ -143,7 +143,8 @@
if ( ! w || ! cap ) return c;
div_cls = (cls == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp';
-
+ cap = cap.replace(/'/gi, "'").replace(/"/gi, '"');
+
return '';
});
@@ -163,7 +164,7 @@
if ( ! w || ! cap ) return c;
cls = cls.match(/align[^ '"]+/) || 'alignnone';
- cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, ''').replace(/"/g, '"');
+ cap = cap.replace(/'/g, ''').replace(/"/g, '"');
return '[caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/caption]';
});
diff --git wp-includes/media.php wp-includes/media.php
index 89a3f36..dcc0263 100644
--- wp-includes/media.php
+++ wp-includes/media.php
@@ -743,7 +743,7 @@ function img_caption_shortcode($attr, $content = null) {
if ( $id ) $id = 'id="' . esc_attr($id) . '" ';
return ''
- . do_shortcode( $content ) . '
' . $caption . '
';
+ . do_shortcode( $content ) . '' . html_entity_decode( $caption ) . '
';
}
add_shortcode('gallery', 'gallery_shortcode');