From d373a7249db0428af7e195a653a465be315094aa Mon Sep 17 00:00:00 2001 From: "John R. D'Orazio" Date: Wed, 2 Oct 2024 03:27:30 +0200 Subject: [PATCH] allow initial nation null val --- php/src/LitSettings.php | 5 ----- php/src/Utilities.php | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/php/src/LitSettings.php b/php/src/LitSettings.php index c499f77..d81101b 100644 --- a/php/src/LitSettings.php +++ b/php/src/LitSettings.php @@ -85,7 +85,6 @@ private function setVars(array $DATA) public function __construct(array $DATA) { - //set a few default values $this->Year = (int)date("Y"); @@ -101,10 +100,6 @@ public function __construct(array $DATA) } $this->setVars($DATA); - - /*if( $this->NationalCalendar !== null ) { - $this->updateSettingsByNation(); - }*/ } private function updateSettingsByNation(string $stagingURL) diff --git a/php/src/Utilities.php b/php/src/Utilities.php index 5848cf8..f0451ae 100644 --- a/php/src/Utilities.php +++ b/php/src/Utilities.php @@ -123,7 +123,7 @@ public static function buildDioceseOptions($MetaData, $NATION, $DIOCESE) return [$options, $i ]; } - public static function buildNationOptions(array $nations, string $NATION, string $locale) + public static function buildNationOptions(array $nations, ?string $NATION, string $locale) { $options = ''; foreach ($nations as $nationVal) {