From 851db9641692435144a4187712152c833348496b Mon Sep 17 00:00:00 2001 From: azaozz Date: Sun, 8 Jul 2012 21:11:23 +0000 Subject: [PATCH] TinyMCE: don't throw fatal errors for malformed/invalid image caption shortcodes, props SergeyBiryukov, see #21145 git-svn-id: http://core.svn.wordpress.org/trunk@21232 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wpeditimage/editor_plugin_src.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js index c241158d32..f771fc9396 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js @@ -142,13 +142,16 @@ var id, cls, w, cap, div_cls, img, trim = tinymce.trim; id = b.match(/id=['"]([^'"]*)['"] ?/); - b = b.replace(id[0], ''); + if ( id ) + b = b.replace(id[0], ''); cls = b.match(/align=['"]([^'"]*)['"] ?/); - b = b.replace(cls[0], ''); + if ( cls ) + b = b.replace(cls[0], ''); w = b.match(/width=['"]([0-9]*)['"] ?/); - b = b.replace(w[0], ''); + if ( w ) + b = b.replace(w[0], ''); c = trim(c); img = c.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i);