tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Removed references to php5 binary in Makefile

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104666 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-05-12 05:28:09 +00:00
parent 2a8dd78059
commit b28b0939f2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -5,13 +5,13 @@
# Most users should simply visit the site root in your web browser.
#
#
URL=`php5 ./cli-script.php SapphireInfo/baseurl`
URL=`php ./cli-script.php SapphireInfo/baseurl`
test: phpunit
phpunit:
php5 ./cli-script.php dev/build "flush=1&$(QUERYSTRING)"
php5 ./cli-script.php dev/tests/all "flush=1&$(QUERYSTRING)"
php ./cli-script.php dev/build "flush=1&$(QUERYSTRING)"
php ./cli-script.php dev/tests/all "flush=1&$(QUERYSTRING)"
windmill:
functest ../cms/tests/test_windmill url=${URL}dev/tests/startsession browser=firefox

2
filesystem/File.php
View File

@ -49,7 +49,7 @@ class File extends DataObject {
*/
public static $allowed_extensions = array(
'','html','htm','xhtml','js','css',
'bmp','png','gif','jpg','jpeg','ico','pcx','tif','tiff','ai','eps',
'bmp','png','gif','jpg','jpeg','ico','pcx','tif','tiff',
'au','mid','midi','mpa','mp3','ogg','m4a','ra','wma','wav','cda',
'avi','mpg','mpeg','asf','wmv','m4v','mov','mkv','mp4','swf','flv','ram','rm',
'doc','docx','txt','rtf','xls','xlsx','pages',