Browse Source

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Yannick Warnier 5 years ago
parent
commit
638927eaed

+ 1 - 1
main/inc/lib/formvalidator/FormValidator.class.php

@@ -1023,7 +1023,7 @@ EOT;
 
         /** @var HtmlEditor $element */
         $element = $this->getElement($name);
-        $config['style'] = false;
+        $config['style'] = isset($config['style']) ? $config['style'] : false;
         if ($fullPage) {
             $config['fullPage'] = true;
             // Adds editor_content.css in ckEditor

+ 1 - 1
main/messages/new_message.php

@@ -179,7 +179,7 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl
         get_lang('Message'),
         false,
         false,
-        ['ToolbarSet' => 'Messages', 'Width' => '100%', 'Height' => '250']
+        ['ToolbarSet' => 'Messages', 'Width' => '100%', 'Height' => '250', 'style' => true]
     );
 
     if (isset($_GET['re_id'])) {