From e7a847a417f891e0a5d217bc56899be25b3ece25 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sat, 24 Feb 2024 19:01:00 +0100 Subject: [PATCH 1/2] Fixed ID class namespace --- app/controllers/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index d9f6e5f280..87008a7c4a 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -20,7 +20,6 @@ use Appwrite\Auth\Auth; use Appwrite\Event\Certificate; use Appwrite\Event\Event; use Appwrite\Event\Usage; -use Appwrite\ID; use Appwrite\Network\Validator\Origin; use Appwrite\Utopia\Response\Filters\V11 as ResponseV11; use Appwrite\Utopia\Response\Filters\V12 as ResponseV12; @@ -33,6 +32,7 @@ use Utopia\Database\Database; use Utopia\Database\DateTime; use Utopia\Database\Document; use Utopia\Database\Query; +use Utopia\Database\Helpers\ID; use Utopia\Database\Validator\Authorization; use Utopia\Validator\Hostname; use Appwrite\Utopia\Request\Filters\V12 as RequestV12; From b78725e650dbcf797ba9dba2f25dc69459f6f90a Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sat, 24 Feb 2024 19:12:27 +0100 Subject: [PATCH 2/2] Hide error messages from HTML templates --- app/controllers/general.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 87008a7c4a..e945189b24 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -936,10 +936,10 @@ App::error() ->setParam('development', App::isDevelopment()) ->setParam('projectName', $project->getAttribute('name')) ->setParam('projectURL', $project->getAttribute('url')) - ->setParam('message', $error->getMessage()) - ->setParam('type', $type) - ->setParam('code', $code) - ->setParam('trace', $trace); + ->setParam('message', $output['message'] ?? '') + ->setParam('type', $output['type'] ?? '') + ->setParam('code', $output['code'] ?? '') + ->setParam('trace', $output['trace'] ?? []); $response->html($layout->render()); }