tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-06-28 23:49:22 +02:00
Code Issues Projects Releases Wiki Activity

Partial revert of #458

Browse Source 
Fix travis configuration
This commit is contained in:
Damian Mooyman 2016-04-28 18:05:19 +12:00
parent 3f0c04523c
commit f029bfcc61
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.travis.yml
View File

@ -4,24 +4,20 @@ sudo: false
language: php
php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
env:
- DB=MYSQL CORE_RELEASE=3.1
matrix:
include:
- php: 5.3
env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.4
env: DB=MYSQL CORE_RELEASE=3.2
- php: 5.5
env: DB=MYSQL CORE_RELEASE=3.3
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.1 SECUREASSETS=1
- php: 5.6
env: DB=PGSQL CORE_RELEASE=3.1
env: DB=PGSQL CORE_RELEASE=3.3
before_script:
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
@ -35,11 +31,3 @@ script:
- git remote rm origin
- git remote add origin git@github.com:silverstripe/silverstripe-userforms.git
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
branches:
only:
- master
matrix:
allow_failures:
- php: 7.0

10
code/model/editableformfields/EditableFileField.php
View File

@ -49,12 +49,10 @@ class EditableFileField extends EditableFormField {
}
public function getFormField() {
if(isset(Config::inst()->get('EditableFileField', 'use_uploadfield')) && Config::inst()->get('EditableFileField', 'use_uploadfield')) {
$field = Upload::create($this->Name, $this->EscapedTitle);
} else {
$field = FileField::create($this->Name, $this->EscapedTitle);
}
$field = FileField::create($this->Name, $this->EscapedTitle)
->setFieldHolderTemplate('UserFormsField_holder')
->setTemplate('UserFormsFileField');
$field->setFieldHolderTemplate('UserFormsField_holder')
->setTemplate('UserFormsFileField');