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

Merge branch '5.1' into 5.2

Browse Source 
# Conflicts:
 #	.travis.yml
This commit is contained in:
Robbie Averill 2019-01-10 12:26:18 +01:00
commit 2fd1c1b504
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -13,7 +13,9 @@ matrix:
- php: 7.1 - php: 7.1
env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.2 - php: 7.2
env: DB=PGSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 env: DB=PGSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
- php: 7.3
env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
before_script: before_script:
# Init PHP # Init PHP

2
code/Model/EditableFormField.php
View File

@ -757,7 +757,7 @@ class EditableFormField extends DataObject
if ($identifier = UserDefinedForm::config()->required_identifier) { if ($identifier = UserDefinedForm::config()->required_identifier) {
$title = $field->Title() . " <span class='required-identifier'>". $identifier . "</span>"; $title = $field->Title() . " <span class='required-identifier'>". $identifier . "</span>";
$field->setTitle($title); $field->setTitle(DBField::create_field('HTMLText', $title));
} }
} }