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

Merge remote branch 'origin/master' into translation-staging

Browse Source
This commit is contained in:
TeamCity 2012-09-26 22:36:55 +12:00
commit 6a263eb98e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/FormField.php
View File

@ -125,7 +125,7 @@ class FormField extends RequestHandler {
*/
public function __construct($name, $title = null, $value = null) {
$this->name = $name;
$this->title = ($title === null) ? $name : $title;
$this->title = ($title === null) ? self::name_to_label($name) : $title;
if($value !== NULL) $this->setValue($value);

2
tests/forms/FormTest.php
View File

@ -211,7 +211,7 @@ class FormTest extends FunctionalTest {
$this->assertPartialMatchBySelector(
'#SomeRequiredField span.required',
array(
'"SomeRequiredField" is required'
'"Some Required Field" is required'
),
'Required fields show a notification on field when left blank'
);