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 pull request #6962 from open-sausages/pulls/4.0/remove-object-2

Browse Source 
BUG Fix minor accessors of legacy ->class property
This commit is contained in:
Chris Joe 2017-05-25 12:32:11 +12:00 committed by GitHub
commit 9fe707d3b9
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Forms/FieldList.php
View File

@ -109,7 +109,8 @@ class FieldList extends ArrayList
$name = $field->getName();
if (isset($list[$name])) {
if ($this->form) {
$errSuffix = " in your '{$this->form->class}' form called '" . $this->form->Name() . "'";
$formClass = get_class($this->form);
$errSuffix = " in your '{$formClass}' form called '" . $this->form->Name() . "'";
} else {
$errSuffix = '';
}

9
src/Forms/TreeMultiselectField.php
View File

@ -8,7 +8,6 @@ use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\ORM\FieldType\DBHTMLText;
use SilverStripe\View\Requirements;
use SilverStripe\View\ViewableData;
use stdClass;
@ -167,8 +166,12 @@ class TreeMultiselectField extends TreeDropdownField
$fieldName = $this->name;
$saveDest = $record->$fieldName();
if (!$saveDest) {
user_error("TreeMultiselectField::saveInto() Field '$fieldName' not found on"
. " $record->class.$record->ID", E_USER_ERROR);
$recordClass = get_class($record);
user_error(
"TreeMultiselectField::saveInto() Field '$fieldName' not found on"
. " {$recordClass}.{$record->ID}",
E_USER_ERROR
);
}
if ($this->value) {

3
tests/php/Forms/DatetimeFieldTest.php
View File

@ -23,11 +23,14 @@ class DatetimeFieldTest extends SapphireTest
{
parent::setUp();
i18n::set_locale('en_NZ');
// Fix now to prevent race conditions
DBDatetime::set_mock_now('2010-04-04');
$this->timezone = date_default_timezone_get();
}
protected function tearDown()
{
DBDatetime::clear_mock_now();
date_default_timezone_set($this->timezone);
parent::tearDown(); // TODO: Change the autogenerated stub
}