diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/includes/modules/modFckeditor.class.php index 2b7665a26d5..57d75a44351 100644 --- a/htdocs/includes/modules/modFckeditor.class.php +++ b/htdocs/includes/modules/modFckeditor.class.php @@ -61,7 +61,7 @@ class modFckeditor extends DolibarrModules $this->picto='list'; // Data directories to create when module is enabled - $this->dirs = array("/fckeditor/temp","/fckeditor/images"); + $this->dirs = array("/fckeditor/temp","/fckeditor/image"); // Config pages $this->config_page_url = array("fckeditor.php"); diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 48020bacf47..08cc07f06d2 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -276,6 +276,13 @@ if ($modulepart) $accessallowed=1; $original_file=$conf->scanner->dir_temp.'/'.$user->id.'/'.$original_file; } + + // Wrapping pour les images fckeditor + elseif ($modulepart == 'fckeditor') + { + $accessallowed=1; + $original_file=$conf->fckeditor->dir_output.'/'.$original_file; + } // GENERIC Wrapping // If modulepart=module_user_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser