Skip to content
Snippets Groups Projects
Commit ac051fb1 authored by Sviatoslav Mankivskyi's avatar Sviatoslav Mankivskyi
Browse files

Merge remote-tracking branch 'origin/MAGETWO-54816' into BUGS

parents 05b9b2b1 191ce71b
No related merge requests found
...@@ -136,6 +136,10 @@ define([ ...@@ -136,6 +136,10 @@ define([
} }
}; };
if (!settings.style_formats) {
settings.theme_advanced_buttons1 = settings.theme_advanced_buttons1.replace(',styleselect', '');
}
// Set the document base URL // Set the document base URL
if (this.config.document_base_url) { if (this.config.document_base_url) {
settings.document_base_url = this.config.document_base_url; settings.document_base_url = this.config.document_base_url;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment