Permalink
Browse files

Merge branch 'w16_MDL-39141_m24_toolbar' of git://github.com/skodak/m…

…oodle into MOODLE_24_STABLE
  • Loading branch information...
2 parents 499c160 + 7fcffb9 commit 3fd370acde1c757ae8bb83e36d16850c76879ca8 @danpoltawski danpoltawski committed Apr 22, 2013
Showing with 1 addition and 2 deletions.
  1. +1 −2 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;

0 comments on commit 3fd370a

Please sign in to comment.