Index: branches/5.2.x/core/ckeditor/ckfinder/config.php =================================================================== diff -u -N -r16404 -r16480 --- branches/5.2.x/core/ckeditor/ckfinder/config.php (.../config.php) (revision 16404) +++ branches/5.2.x/core/ckeditor/ckfinder/config.php (.../config.php) (revision 16480) @@ -221,7 +221,7 @@ 'url' => $baseUrl . 'Files', 'directory' => $baseDir . 'Files', 'maxSize' => 0, - 'allowedExtensions' => 'jpg,gif,jpeg,png,swf,fla,jpg,gif,jpeg,png,avi,mpg,mpeg,zip,rar,arj,gz,tar,doc,pdf,ppt,rdp,swf,swt,txt,vsd,xls,csv,odt', + 'allowedExtensions' => 'jpg,gif,jpeg,png,swf,fla,jpg,gif,jpeg,png,avi,mpg,mpeg,zip,rar,arj,gz,tar,doc,docx,dotx,docm,dotm,pdf,ppt,pptx,potx,ppsx,ppam,pptm,potm,ppsm,rdp,swf,swt,txt,vsd,xls,xlsx,xltx,xlsm,xltm,xlam,xlsb,csv,odt', 'deniedExtensions' => 'php,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,dll,reg'); $config['ResourceType'][] = Array( @@ -253,7 +253,7 @@ 'url' => $baseUrl . 'Documents', 'directory' => $baseDir . 'Documents', 'maxSize' => 0, - 'allowedExtensions' => 'doc,pdf,ppt,rdp,swf,swt,txt,vsd,xls,csv,zip,odt', + 'allowedExtensions' => 'doc,docx,dotx,docm,dotm,pdf,ppt,pptx,potx,ppsx,ppam,pptm,potm,ppsm,rdp,swf,swt,txt,vsd,xls,xlsx,xltx,xlsm,xltm,xlam,xlsb,csv,zip,odt', 'deniedExtensions' => 'php,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,dll,reg'); /*