From fbfcb6d8aa1db76a4d58bd7435db4d2cfcf53b51 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 29 May 2013 17:36:11 +0200 Subject: [PATCH] New video formats in allowed_extensions See https://github.com/silverstripe/silverstripe-installer/pull/41 --- filesystem/File.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/filesystem/File.php b/filesystem/File.php index 270203827..a4f1ab985 100644 --- a/filesystem/File.php +++ b/filesystem/File.php @@ -112,9 +112,9 @@ class File extends DataObject { private static $allowed_extensions = array( '','ace','arc','arj','asf','au','avi','bmp','bz2','cab','cda','css','csv','dmg','doc','docx', 'flv','gif','gpx','gz','hqx','htm','html','ico','jar','jpeg','jpg','js','kml', 'm4a','m4v', - 'mid','midi','mkv','mov','mp3','mp4','mpa','mpeg','mpg','ogg','pages','pcx','pdf','pkg', + 'mid','midi','mkv','mov','mp3','mp4','mpa','mpeg','mpg','ogg','ogv','pages','pcx','pdf','pkg', 'png','pps','ppt','pptx','ra','ram','rm','rtf','sit','sitx','swf','tar','tgz','tif','tiff', - 'txt','wav','wma','wmv','xhtml','xls','xlsx','xml','zip','zipx', + 'txt','wav','webm','wma','wmv','xhtml','xls','xlsx','xml','zip','zipx', ); /** @@ -127,7 +127,7 @@ class File extends DataObject { "apl", "avr" ,"cda" ,"mp4" ,"ogg" ), 'mov' => array( - "mpeg" ,"mpg" ,"m1v" ,"mp2" ,"mpa" ,"mpe" ,"ifo" ,"vob","avi" ,"wmv" ,"asf" ,"m2v" ,"qt" + "mpeg" ,"mpg" ,"m1v" ,"mp2" ,"mpa" ,"mpe" ,"ifo" ,"vob","avi" ,"wmv" ,"asf" ,"m2v" ,"qt", "ogv", "webm" ), 'zip' => array( "arc" ,"rar" ,"tar" ,"gz" ,"tgz" ,"bz2" ,"dmg" ,"jar","ace" ,"arj" ,"bz" ,"cab"