From f25bfa805b828da2eed84455f4563cc5e76b9d1a Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 29 Mar 2023 16:30:47 +1300 Subject: [PATCH] Fix more name collisions --- app/controllers/api/databases.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index a49db96799..39fceb633a 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -2812,9 +2812,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents') $documentSecurity = $collection->getAttribute('documentSecurity', false); $validator = new Authorization(Database::PERMISSION_READ); - $valid = $validator->isValid($collection->getRead()); - - if (!$valid) { + if (!$validator->isValid($collection->getRead())) { $total = $documentSecurity ? $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filterQueries, APP_LIMIT_COUNT) : 0; @@ -3395,12 +3393,12 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu fn() => $dbForProject->getDocument('database_' . $database->getInternalId(), $relatedCollectionId) ); - foreach ($related as $document) { + foreach ($related as $relation) { if ( - $document instanceof Document + $relation instanceof Document && $relationship->getAttribute('onDelete') === Database::RELATION_MUTATE_CASCADE ) { - $checkPermissions($relatedCollection, $document); + $checkPermissions($relatedCollection, $relation); } } } @@ -3444,8 +3442,8 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu fn() => $dbForProject->getDocument('database_' . $database->getInternalId(), $relatedCollectionId) ); - foreach ($related as $document) { - $processDocument($relatedCollection, $document); + foreach ($related as $relation) { + $processDocument($relatedCollection, $relation); } } };