Merge branch 'master' into 'apiext'

# Conflicts: # config/routes.php
2021-12-17 09:58:59 +00:00
parent 7dd4586d46 c0fd222c18
commit 56437f6418
1367 changed files with 112946 additions and 46874 deletions
@@ -927,6 +927,14 @@ class baseControl
        {
            if(!empty($data['message']))
            {
+                if(is_string($data['message']))
+                {
+                    echo js::alert($data['message']);
+                    $locate = isset($data['locate']) ? $data['locate'] : (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '');
+                    if (!empty($locate)) die(js::locate($locate));
+                    die(isset($data['message']) ? $data['message'] : 'fail');
+                }
+
                $message = json_decode(json_encode((array)$data['message']));
                foreach((array)$message as $item => $errors) $message->$item = implode(',', $errors);
                die(js::alert(strip_tags(implode('\n', (array)$message))));
@@ -944,10 +952,7 @@ class baseControl
     */
    public function sendError($error)
    {
-        $this->send([
-            'result'  => 'fail',
-            'message' => $error,
-        ]);
+        $this->send(array('result' => 'fail', 'message' => $error));
    }

    /**