Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-39141 fix customtoolbar notices during upgrade

  • Loading branch information...
commit 7fcffb98bbc48f3667348b3f6340399f6d24aaa7 1 parent d298661
@skodak skodak authored
Showing with 1 addition and 2 deletions.
  1. +1 −2  lib/editor/tinymce/lib.php
View
3  lib/editor/tinymce/lib.php
@@ -172,8 +172,7 @@ protected function get_init_params($elementid, array $options=null) {
);
// Should we override the default toolbar layout unconditionally?
- $customtoolbar = self::parse_toolbar_setting($config->customtoolbar);
- if ($customtoolbar) {
+ if (!empty($config->customtoolbar) and $customtoolbar = self::parse_toolbar_setting($config->customtoolbar)) {
$i = 1;
foreach ($customtoolbar as $line) {
$params['theme_advanced_buttons'.$i] = $line;
Please sign in to comment.
Something went wrong with that request. Please try again.