From 0cd40ca6e50cecf582eda952d3a7a0a3788a5397 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 25 May 2017 11:55:12 +1200
Subject: [PATCH] BUG Fix minor accessors of legacy ->class property

---
 src/Forms/FieldList.php            | 3 ++-
 src/Forms/TreeMultiselectField.php | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Forms/FieldList.php b/src/Forms/FieldList.php
index 5563022a4..6acfbbf61 100644
--- a/src/Forms/FieldList.php
+++ b/src/Forms/FieldList.php
@@ -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 = '';
                     }
diff --git a/src/Forms/TreeMultiselectField.php b/src/Forms/TreeMultiselectField.php
index 6052a41e0..85380bae8 100644
--- a/src/Forms/TreeMultiselectField.php
+++ b/src/Forms/TreeMultiselectField.php
@@ -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) {