Merge branch 'master' of https://github.com/ChurchCRM/CRM

ChurchCRM · Oct 26, 2023 · aa1a837 · aa1a837
2 parents 8cc266b + 8c7ce64
commit aa1a837
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/ChurchCRM/Reports/PDF_Directory.php b/src/ChurchCRM/Reports/PDF_Directory.php
@@ -18,6 +18,7 @@ class PDF_Directory extends ChurchInfoReport
     public $_Gutter = 5;
     public $_LS = 4;
     public $sFamily;
+    public string $sRecordName;
     public $sLastName;
     public $_ColWidth = 58;
     public $_Custom = [];

diff --git a/src/ChurchCRM/data/States.php b/src/ChurchCRM/data/States.php
@@ -13,8 +13,8 @@ public function __construct($countryCode)
         $this->countryCode = $countryCode;
         $stateFileName = SystemURLs::getDocumentRoot() . '/locale/states/'. $countryCode .'.json';
         if( is_file($stateFileName)) {
-            $satesFile = file_get_contents($stateFileName);
-            $this->states = json_decode($satesFile, true, 512, JSON_THROW_ON_ERROR);
+            $statesFile = file_get_contents($stateFileName);
+            $this->states = json_decode($statesFile, true, 512, JSON_THROW_ON_ERROR);
         }
     }
 

diff --git a/src/SystemDBUpdate.php b/src/SystemDBUpdate.php
@@ -17,16 +17,17 @@
     exit;
 }
 
-if (isset($_GET['upgrade']) && InputUtils::FilterString($_GET['upgrade']) == "true") {
+$logger = LoggerUtils::getAppLogger();
+if (isset($_GET['upgrade']) && InputUtils::FilterString($_GET['upgrade']) === "true") {
     try {
-        LoggerUtils::getAppLogger()->info("Beginning database upgrade");
+        $logger->info("Beginning database upgrade");
         UpgradeService::upgradeDatabaseVersion();
-        LoggerUtils::getAppLogger()->info("Complete database upgrade; redirecting to Main menu");
+        $logger->info("Complete database upgrade; redirecting to Main menu");
         RedirectUtils::Redirect('Menu.php');
         exit;
     } catch (Exception $ex) {
         $errorMessage = $ex->getMessage();
-        LoggerUtils::getAppLogger()->error("Error updating database: " .$errorMessage);
+        $logger->error("Error updating database: " .$errorMessage, ['exception' => $ex]);
     }
 }