FIX Replace Convert JSON methods with json_* methods, deprecated from…

… SilverStripe 4.4
symbiote · Oct 28, 2018 · 4a4d3ea · 4a4d3ea
1 parent 6126dbd
commit 4a4d3ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Controllers/AdvancedWorkflowActionController.php b/src/Controllers/AdvancedWorkflowActionController.php
@@ -50,7 +50,7 @@ public function transition($request)
                     'link'    => $instance->getTarget()->AbsoluteLink()
                 );
                 if (Director::is_ajax()) {
-                    return Convert::raw2json($result);
+                    return json_encode($result);
                 }
                 return $this->redirect($instance->getTarget()->Link());
             }
@@ -60,7 +60,7 @@ public function transition($request)
             $result = array(
                 'success' => false,
             );
-            return Convert::raw2json($result);
+            return json_encode($result);
         }
 
         return $this->redirect($instance->getTarget()->Link());

diff --git a/src/Forms/FrontendWorkflowForm.php b/src/Forms/FrontendWorkflowForm.php
@@ -111,7 +111,7 @@ public function httpSubmission($request)
                 $acceptType = $request->getHeader('Accept');
                 if (strpos($acceptType, 'application/json') !== false) {
                     // Send validation errors back as JSON with a flag at the start
-                    $response = new HTTPResponse(Convert::array2json($this->validator->getErrors()));
+                    $response = new HTTPResponse(json_encode($this->validator->getErrors()));
                     $response->addHeader('Content-Type', 'application/json');
                 } else {
                     $this->setupFormErrors();