Merge branch 't/13132' into major

ckeditor · Apr 3, 2015 · 8b2157e · 8b2157e
2 parents 1b974b7 + f77281f
commit 8b2157e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/samples/toolbarconfigurator/js/toolbartextmodifier.js b/samples/toolbarconfigurator/js/toolbartextmodifier.js
@@ -511,9 +511,8 @@
 		try {
 			var config = {};
 			( function() {
-				var CKEDITOR = {};
+				var CKEDITOR = Function( 'var CKEDITOR = {}; ' + val + '; return CKEDITOR;' )();
 
-				eval( val );
 				CKEDITOR.editorConfig( config );
 				parsed = config;
 			} )();