Merge branch 'w16_MDL-39141_m24_toolbar' of git://github.com/skodak/moodle into MOODLE_24_STABLE

2013-04-22 12:40:44 +01:00
parent 499c16040d 7fcffb98bb
commit 3fd370acde
1 changed files with 1 additions and 2 deletions
@@ -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;