diff --git wp-includes/js/tinymce/plugins/wpeditimage/editimage.html wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
index d7ad227..5627ee2 100644
|
|
if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') ) |
103 | 103 | </label> |
104 | 104 | </th> |
105 | 105 | <td class="field"> |
106 | | <input type="text" id="img_cap" name="img_cap" value="" size="60" /> |
| 106 | <textarea id="img_cap" name="img_cap" value="" rows="4" cols="60"></textarea> |
107 | 107 | </td> |
108 | 108 | </tr> |
109 | 109 | |
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
|
|
|
143 | 143 | if ( ! w || ! cap ) return c; |
144 | 144 | |
145 | 145 | div_cls = (cls == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp'; |
146 | | |
| 146 | cap = cap.replace(/'/gi, "'").replace(/"/gi, '"'); |
| 147 | |
147 | 148 | return '<div class="'+div_cls+'" draggable><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+(10+parseInt(w))+ |
148 | 149 | 'px"><dt class="wp-caption-dt">'+c+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>'; |
149 | 150 | }); |
… |
… |
|
163 | 164 | |
164 | 165 | if ( ! w || ! cap ) return c; |
165 | 166 | cls = cls.match(/align[^ '"]+/) || 'alignnone'; |
166 | | cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, ''').replace(/"/g, '"'); |
| 167 | cap = cap.replace(/'/g, ''').replace(/"/g, '"'); |
167 | 168 | |
168 | 169 | return '[caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/caption]'; |
169 | 170 | }); |
diff --git wp-includes/media.php wp-includes/media.php
index 89a3f36..dcc0263 100644
|
|
function img_caption_shortcode($attr, $content = null) { |
743 | 743 | if ( $id ) $id = 'id="' . esc_attr($id) . '" '; |
744 | 744 | |
745 | 745 | return '<div ' . $id . 'class="wp-caption ' . esc_attr($align) . '" style="width: ' . (10 + (int) $width) . 'px">' |
746 | | . do_shortcode( $content ) . '<p class="wp-caption-text">' . $caption . '</p></div>'; |
| 746 | . do_shortcode( $content ) . '<p class="wp-caption-text">' . html_entity_decode( $caption ) . '</p></div>'; |
747 | 747 | } |
748 | 748 | |
749 | 749 | add_shortcode('gallery', 'gallery_shortcode'); |