diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index fc86d661296..f53498fafe8 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -157,11 +157,7 @@ class DolEditor define('REQUIRE_CKEDITOR', '1'); } - if (!empty($conf->global->FCKEDITOR_SKIN)) { - $skin = $conf->global->FCKEDITOR_SKIN; - } else { - $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa - } + $skin = getDolGlobalString('FCKEDITOR_SKIN', 'moono-lisa'); // default with ckeditor 4.6 : moono-lisa $pluginstodisable = 'elementspath,save,flash,div,specialchar,anchor'; if (!empty($conf->dol_optimize_smallscreen)) { diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php index fecf10f48fe..c2e1955d8de 100644 --- a/htdocs/core/lib/doleditor.lib.php +++ b/htdocs/core/lib/doleditor.lib.php @@ -49,12 +49,7 @@ function show_skin($fuser, $edit = 0) $dirskins = array_unique($dirskins); // Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme') - $selected_theme = ''; - if (empty($conf->global->FCKEDITOR_SKIN)) { - $selected_theme = 'moono-lisa'; - } else { - $selected_theme = $conf->global->FCKEDITOR_SKIN; - } + $selected_theme = getDolGlobalString('FCKEDITOR_SKIN', 'moono-lisa'); $colspan = 2; diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php index 357e280f9f6..df996a312bf 100644 --- a/htdocs/core/modules/modExport.class.php +++ b/htdocs/core/modules/modExport.class.php @@ -64,6 +64,7 @@ class modExport extends DolibarrModules $this->requiredby = array(); $this->phpmin = array(7, 0); $this->phpmax = array(); + $this->enabled_bydefault = true; // Will be enabled during install // Constants $this->const = array(); diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php index fa3a66c37cc..9dd3fce7fcd 100644 --- a/htdocs/core/modules/modFckeditor.class.php +++ b/htdocs/core/modules/modFckeditor.class.php @@ -66,6 +66,7 @@ class modFckeditor extends DolibarrModules $this->disabled = in_array(constant('JS_CKEDITOR'), array('disabled', 'disabled/')); $this->depends = array(); $this->requiredby = array('modWebsites'); + $this->enabled_bydefault = true; // Will be enabled during install // Constants $this->const = array(); @@ -74,7 +75,6 @@ class modFckeditor extends DolibarrModules $this->const[3] = array("FCKEDITOR_ENABLE_USERSIGN", "yesno", "1", "WYSIWIG for user signature"); $this->const[4] = array("FCKEDITOR_ENABLE_MAILING", "yesno", "1", "WYSIWIG for mass emailings"); $this->const[5] = array("FCKEDITOR_ENABLE_MAIL", "yesno", "1", "WYSIWIG for products details lines for all entities"); - $this->const[6] = array("FCKEDITOR_SKIN", "string", "moono-lisa", "Skin by default for fckeditor"); // Boxes $this->boxes = array(); diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php index ad0f33c8da2..63f0ca5189f 100644 --- a/htdocs/core/modules/modImport.class.php +++ b/htdocs/core/modules/modImport.class.php @@ -67,7 +67,7 @@ class modImport extends DolibarrModules $this->phpmin = array(7, 0); // Minimum version of PHP required by module - Need auto_detect_line_endings php option to solve MAC pbs. $this->phpmax = array(); $this->need_dolibarr_version = array(2, 7, -1); // Minimum version of Dolibarr required by module - $this->need_javascript_ajax = 1; + $this->enabled_bydefault = true; // Will be enabled during install // Constants $this->const = array();