3.7 regression: Fix the width of captioned images inserted into the v…

…isual editor. Pulls some arithmetic outside of some string concatenation to avoid a nasty uglify.js regression: mishoo/UglifyJS#330. Merges [25921] to the 3.7 branch. props LucP. fixes #25700. Built from https://develop.svn.wordpress.org/branches/3.7@25922 git-svn-id: http://core.svn.wordpress.org/branches/3.7@25881 1a063a9b-81f0-0310-95a4-ce76da25c4cd
VenusPR · Oct 26, 2013 · abf43b2 · abf43b2
1 parent c04bf89
commit abf43b2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js
@@ -160,7 +160,8 @@
 				if ( cls == 'aligncenter' )
 					div_cls += ' mceIEcenter';
 
-				return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+( 10 + parseInt(w) )+
+				w = parseInt( w, 10 ) + 10;
+				return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+w+
 				'px"><dt class="wp-caption-dt">'+img+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>';
 			});
 		},

diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz