From 7fcffb98bbc48f3667348b3f6340399f6d24aaa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Tue, 16 Apr 2013 10:21:29 +0200 Subject: [PATCH] MDL-39141 fix customtoolbar notices during upgrade --- lib/editor/tinymce/lib.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php index 728ce268cf5..1208fdf0b92 100644 --- a/lib/editor/tinymce/lib.php +++ b/lib/editor/tinymce/lib.php @@ -172,8 +172,7 @@ class tinymce_texteditor extends texteditor { ); // 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;