MDL-39141 fix customtoolbar notices during upgrade

2013-04-18 20:22:01 +02:00
parent 3a8c4380c0
commit 9a1c818d28
1 changed files with 1 additions and 2 deletions
@@ -173,8 +173,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;