Skip to content
Permalink
Browse files

Merge branch 't/9636b'

  • Loading branch information...
Reinmar committed Nov 15, 2012
2 parents 02c770e + ff79d74 commit 3aeeb21326cf230c4f4a6e3f4956f8c2017bd55d
Showing with 4 additions and 1 deletion.
  1. +3 −0 core/editor.js
  2. +1 −1 plugins/toolbar/plugin.js
@@ -30,6 +30,9 @@
// Call the CKEDITOR.event constructor to initialize this instance.
CKEDITOR.event.call( this );

// Make a clone of the config object, to avoid having it touched by our code. (#9636)
instanceConfig = instanceConfig && CKEDITOR.tools.clone( instanceConfig );

// if editor is created off one page element.
if ( element !== undefined ) {
// Asserting element and mode not null.
@@ -415,7 +415,7 @@

// Take the base for the new toolbar, which is basically a toolbar
// definition without items.
var toolbar = editor.config.toolbarGroups || getPrivateToolbarGroups( editor );
var toolbar = CKEDITOR.tools.clone( editor.config.toolbarGroups ) || getPrivateToolbarGroups( editor );

// Fill the toolbar groups with the available ui items.
for ( var i = 0; i < toolbar.length; i++ ) {

0 comments on commit 3aeeb21

Please sign in to comment.
You can’t perform that action at this time.