Merge branch 't/13173b' into major

ckeditor · May 4, 2015 · ba216e3 · ba216e3
2 parents c0a9cef + 5c7af83
commit ba216e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Fixed Issues:
   * [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.
   * [#13136](http://dev.ckeditor.com/ticket/13136): Fixed: Autocompleter is far too intrusive.
   * [#13133](http://dev.ckeditor.com/ticket/13133): Fixed: Tab leaves the editor.
+  * [#13173](http://dev.ckeditor.com/ticket/13173): Fixed: `config.removeButtons` is ignored by the advanced toolbar configurator.
 
 ## CKEditor 4.5 Beta
 

diff --git a/samples/toolbarconfigurator/js/toolbartextmodifier.js b/samples/toolbarconfigurator/js/toolbartextmodifier.js
@@ -399,7 +399,7 @@
 
 		this._fixGroups( cfg );
 
-		cfg.toolbar = this._mapToolbarGroupsToToolbar( cfg.toolbarGroups );
+		cfg.toolbar = this._mapToolbarGroupsToToolbar( cfg.toolbarGroups, this.actualConfig.removeButtons );
 
 		this.actualConfig.toolbar = cfg.toolbar;
 		this.actualConfig.removeButtons = '';