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

Merge pull request #68 from creative-commoners/pulls/3.0/remove-json-methods 

FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4
This commit is contained in:
Guy Marriott 2018-10-29 11:28:25 +13:00 committed by GitHub
parent 21d8212807 fc934d93fd
commit 6d39bc23ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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() public function onBeforeWrite()
{ {
$fieldMap = Convert::json2array($this->SpamFieldSettings); $fieldMap = json_decode($this->SpamFieldSettings, true);
if (empty($fieldMap)) { if (empty($fieldMap)) {
$fieldMap = array(); $fieldMap = array();
} }
@ -132,7 +132,7 @@ class EditableSpamProtectionField extends EditableFormField
$fieldMap[substr($key, 8)] = $value; $fieldMap[substr($key, 8)] = $value;
} }
} }
$this->setField('SpamFieldSettings', Convert::raw2json($fieldMap)); $this->setField('SpamFieldSettings', json_encode($fieldMap));
return parent::onBeforeWrite(); return parent::onBeforeWrite();
} }
@ -192,7 +192,7 @@ class EditableSpamProtectionField extends EditableFormField
*/ */
public function spamMapValue($mapSetting) public function spamMapValue($mapSetting)
{ {
$map = Convert::json2array($this->SpamFieldSettings); $map = json_decode($this->SpamFieldSettings, true);
if (empty($map)) { if (empty($map)) {
$map = array(); $map = array();
} }