Merge branch 'master' into snyk-upgrade-c207138d937a7a7ac942457465d95cab

package.json

@@ -1,6 +1,6 @@
 {
     "name": "churchcrm",
-    "version": "4.5.1",
+    "version": "4.5.2",
     "description": "Free Church CRM Software",
     "repository": {
         "type": "git",

src/ChurchCRM/Reports/ChurchInfoReport.php

@@ -138,7 +138,7 @@ public function StartLetterPage($fam_ID, $fam_Name, $fam_Address1, $fam_Address2
     public function MakeSalutation($famID)
     {
         $family = FamilyQuery::create()->findPk($famID);
-        return $family->getSaluation();
+        return $family->getSalutation();
 
     }
 }

src/MapUsingGoogle.php

@@ -226,7 +226,7 @@ function initialize() {
                     $photoFileThumb = SystemURLs::getRootPath() . '/api/family/' . $family->getId() . '/photo';
                     $arr['ID'] = $family->getId();
                     $arr['Name'] = $family->getName();
-                    $arr['Salutation'] = $family->getSaluation();
+                    $arr['Salutation'] = $family->getSalutation();
                     $arr['Address'] = $family->getAddress();
                     $arr['Thumbnail'] = $photoFileThumb;
                     $arr['Latitude'] = $family->getLatitude();

src/api/routes/calendar/events.php

@@ -135,7 +135,7 @@ function newEvent($request, $response, $args)
     $event->setCalendars($calendars);
     $event->save();
 
-    return $response->withJSON(array("status" => "success"));
+    return $response->withJson(array("status" => "success"));
 }
 
 function updateEvent($request, $response, $args)

src/api/routes/people/people-family.php

@@ -29,7 +29,7 @@
 
     $this->delete('/photo', function ($request, $response, $args) {
         $family = $request->getAttribute("family");
-        return $response->withJSON(["status" => $family->deletePhoto()]);
+        return $response->withJson(["status" => $family->deletePhoto()]);
     })->add(new EditRecordsRoleAuthMiddleware());
 
     $this->get('/thumbnail', function ($request, $response, $args) {
@@ -95,7 +95,7 @@
     $this->post('/verify/now', function ($request, $response, $args) {
         $family = $request->getAttribute("family");
         $family->verify();
-        return $response->withJSON(["message" => "Success"]);
+        return $response->withJson(["message" => "Success"]);
     });
 
 })->add(new FamilyAPIMiddleware());

src/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "churchcrm/crm",
-    "version": "4.5.1",
+    "version": "4.5.2",
     "type": "project",
     "keywords": [
         "church",

src/mysql/upgrade.json

@@ -307,9 +307,10 @@
     },
     "current": {
         "versions": [
-            "4.5.0"
+            "4.5.0",
+            "4.5.1"
         ],
         "scripts": [],
-        "dbVersion": "4.5.1"
+        "dbVersion": "4.5.2"
     }
 }