Merge branch 'master' into issue-6651

ChurchCRM · Oct 14, 2024 · 262da7d · 262da7d
2 parents a341821 + 22de6c8
commit 262da7d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
         "jquery-validation": "^1.21.0",
         "pace-js": "^1.2.4",
         "react-bootstrap": "^2.10.4",
-        "react-datepicker": "^7.3.0",
+        "react-datepicker": "^7.4.0",
         "react-select": "^5.8.1",
         "select2": "^4.0.13"
     },

diff --git a/src/EventAttendance.php b/src/EventAttendance.php
@@ -139,7 +139,6 @@
     $aEventTitle[$row] = htmlentities(stripslashes($event->getTitle()), ENT_NOQUOTES, 'UTF-8');
     $aEventStartDateTime[$row] = $event->getStart(\DateTimeInterface::ATOM);
 }
-require 'Include/Header.php';
 
 // Construct the form
 ?>