From d635f5a3259f7618d9770197b584a66524481796 Mon Sep 17 00:00:00 2001 From: Thomas David Baker Date: Wed, 25 Sep 2024 08:44:49 -0700 Subject: [PATCH] Handle nulls correctly when trying to parse decklists --- gatherling/deck.php | 8 ++++---- gatherling/lib.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gatherling/deck.php b/gatherling/deck.php index c72b6ff9..4866e1df 100644 --- a/gatherling/deck.php +++ b/gatherling/deck.php @@ -278,8 +278,8 @@ function insertDeck($event) $deck->eventname = $event->name; $deck->event_id = $event->id; - $deck->maindeck_cards = parseCardsWithQuantity($_POST['contents']); - $deck->sideboard_cards = parseCardsWithQuantity($_POST['sideboard']); + $deck->maindeck_cards = parseCardsWithQuantity($_POST['contents'] ?? []); + $deck->sideboard_cards = parseCardsWithQuantity($_POST['sideboard'] ?? []); if (!$deck->save()) { deckForm($deck); @@ -294,8 +294,8 @@ function updateDeck($deck) $deck->name = $_POST['name']; $deck->notes = $_POST['notes']; - $deck->maindeck_cards = parseCardsWithQuantity($_POST['contents']); - $deck->sideboard_cards = parseCardsWithQuantity($_POST['sideboard']); + $deck->maindeck_cards = parseCardsWithQuantity($_POST['contents'] ?? []); + $deck->sideboard_cards = parseCardsWithQuantity($_POST['sideboard'] ?? []); if (!$deck->save()) { deckForm($deck); diff --git a/gatherling/lib.php b/gatherling/lib.php index 0b380ad8..3921ead9 100644 --- a/gatherling/lib.php +++ b/gatherling/lib.php @@ -287,7 +287,7 @@ function normaliseCardName($card, $toLower = false): string return trim($card); } -function parseCardsWithQuantity($cards): array +function parseCardsWithQuantity(string|array $cards): array { $cards = parseCards($cards); $badcards = [];