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

BUG Fix minor accessors of legacy ->class property

Browse Source
This commit is contained in:
Damian Mooyman 2017-05-25 11:55:12 +12:00
parent 29f450b1e1
commit 0cd40ca6e5
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 8 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(); $name = $field->getName();
if (isset($list[$name])) { if (isset($list[$name])) {
if ($this->form) { 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 { } else {
$errSuffix = ''; $errSuffix = '';
} }

9
src/Forms/TreeMultiselectField.php
View File

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