From c1ecf43be873930a88fabac5e7ac0f60c48221b7 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 21 Oct 2013 17:39:20 +0200 Subject: [PATCH] [-] MO : Fix bug #PSCFV-10775, could not upload .jpeg in TinyMCE --- admin-dev/ajaxfilemanager/inc/config.base.php | 4 ++-- admin-dev/ajaxfilemanager/inc/config.tinymce.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin-dev/ajaxfilemanager/inc/config.base.php b/admin-dev/ajaxfilemanager/inc/config.base.php index 28155f21e..5b57feed0 100755 --- a/admin-dev/ajaxfilemanager/inc/config.base.php +++ b/admin-dev/ajaxfilemanager/inc/config.base.php @@ -78,9 +78,9 @@ define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste - define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png');// // + define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png');// // //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');// - define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,png'); + define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,jpeg,jpeg,png'); //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // define('CONFIG_UPLOAD_INVALID_EXTS', ''); diff --git a/admin-dev/ajaxfilemanager/inc/config.tinymce.php b/admin-dev/ajaxfilemanager/inc/config.tinymce.php index c406f47e5..9070323a2 100755 --- a/admin-dev/ajaxfilemanager/inc/config.tinymce.php +++ b/admin-dev/ajaxfilemanager/inc/config.tinymce.php @@ -73,9 +73,9 @@ define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste - define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // + define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,txt'); // //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');// - define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf'); + define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf'); //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // define('CONFIG_UPLOAD_INVALID_EXTS', '');