Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2013-04-29 09:32:58 +02:00
commit 8f3c0b57ba

View File

@ -95,7 +95,7 @@ class HtmlEditorField extends TextareaField {
} }
public function saveInto(DataObjectInterface $record) { public function saveInto(DataObjectInterface $record) {
if($record->escapeTypeForField($this->name) != 'xml') { if($record->hasField($this->name) && $record->escapeTypeForField($this->name) != 'xml') {
throw new Exception ( throw new Exception (
'HtmlEditorField->saveInto(): This field should save into a HTMLText or HTMLVarchar field.' 'HtmlEditorField->saveInto(): This field should save into a HTMLText or HTMLVarchar field.'
); );