Merge branch 'develop' into qlo-remove-mysql2

2021-10-19 12:15:25 +05:30
parent f53e5c778b 7234ef3362
commit 3d247b81fc
1459 changed files with 125284 additions and 69810 deletions
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -665,7 +665,7 @@ class AdminImportControllerCore extends AdminController
            $_FILES['file']['filename'] = $filename_prefix.str_replace('\0', '', $_FILES['file']['name']);
        }

-        die(Tools::jsonEncode($_FILES));
+        die(json_encode($_FILES));
    }

    public function renderView()