From 928bf0491d71773fac7dea00b8d72dee5db54e48 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Sat, 26 Oct 2013 02:51:31 +0000
Subject: [PATCH] 3.7 regression: Fix the width of captioned images inserted
 into the visual editor.

Pulls some arithmetic outside of some string concatenation to avoid a nasty uglify.js regression: https://github.com/mishoo/UglifyJS2/pull/330.

Merges [25921] to the 3.7 branch.

props LucP.
fixes #25700.


git-svn-id: https://develop.svn.wordpress.org/branches/3.7@25922 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../js/tinymce/plugins/wpeditimage/editor_plugin_src.js        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js
index 17aa30e206..b26ed4a1a7 100644
--- a/src/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js
+++ b/src/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>';
 			});
 		},