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

main/inc/lib/javascript/ckeditor/config_js.php

@@ -10,6 +10,7 @@ if (api_get_setting('more_buttons_maximized_mode') === 'true') {
 }
 
 $template = new Template();
+$template->setCSSEditor();
 $template->assign('moreButtonsInMaximizedMode', $moreButtonsInMaximizedMode);
 $template->assign('course_condition', api_get_cidreq());
 

main/inc/lib/template.lib.php

@@ -184,7 +184,7 @@ class Template
 
         // Setting administrator variables
         $this->setAdministratorParams();
-        $this->setCSSEditor();
+        //$this->setCSSEditor();
 
         // Header and footer are showed by default
         $this->set_footer($show_footer);
@@ -649,12 +649,6 @@ class Template
             }
         }
 
-        if (is_file(api_get_path(SYS_CSS_PATH).$this->themeDir.'editor.css')) {
-            $css[] = api_get_path(WEB_CSS_PATH).$this->themeDir.'editor.css';
-        } else {
-            $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'editor.css');
-        }
-
         $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->themeDir.'default.css');
 
         $css_file_to_string = null;