tonyair
/
silverstripe-spamprotection
mirror of https://github.com/silverstripe/silverstripe-spamprotection.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.0'

This commit is contained in:
Robbie Averill 2018-11-07 16:35:56 +02:00
parent 506d82fc9d 0c445a1dbf
commit b88a706ae7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/EditableSpamProtectionField.php
View File

@ -122,7 +122,7 @@ class EditableSpamProtectionField extends EditableFormField
*/
public function onBeforeWrite()
{
$fieldMap = Convert::json2array($this->SpamFieldSettings);
$fieldMap = json_decode($this->SpamFieldSettings, true);
if (empty($fieldMap)) {
$fieldMap = array();
}
@ -132,7 +132,7 @@ class EditableSpamProtectionField extends EditableFormField
$fieldMap[substr($key, 8)] = $value;
}
}
$this->setField('SpamFieldSettings', Convert::raw2json($fieldMap));
$this->setField('SpamFieldSettings', json_encode($fieldMap));
return parent::onBeforeWrite();
}
@ -192,7 +192,7 @@ class EditableSpamProtectionField extends EditableFormField
*/
public function spamMapValue($mapSetting)
{
$map = Convert::json2array($this->SpamFieldSettings);
$map = json_decode($this->SpamFieldSettings, true);
if (empty($map)) {
$map = array();
}