Merge branch 'craigk5n:master' into xact

craigk5n · Apr 14, 2024 · a4b7f91 · a4b7f91
2 parents 8d7d5f7 + 48cb0cf
commit a4b7f91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/includes/classes/Event.php b/includes/classes/Event.php
@@ -202,7 +202,7 @@ function __construct ( $name, $description, $date, $time, $id, $extForID,
     $this->_calType = $calType;
     $this->_location = $location;
     $this->_url = $url;
-    $this->_dueDate  = $dueDate;
+    $this->_dueDate  = empty($dueDate) ? '' : $dueDate;
     $this->_dueTime  = sprintf ( "%06d", $dueTime );
     $this->_due = $dueDate . sprintf ( "%06d", $dueTime );
     $this->_percent = $percent;

diff --git a/includes/functions.php b/includes/functions.php
@@ -821,14 +821,14 @@ function date_to_epoch( $d, $gmt = true ) {
 
   if ( $gmt )
     return gmmktime ( $dH, $di, $ds,
-      substr ( $d, 4, 2 ),
-      substr ( $d, 6, 2 ),
-      substr ( $d, 0, 4 ) );
+      (int)substr ( $d, 4, 2 ),
+      (int)substr ( $d, 6, 2 ),
+      (int)substr ( $d, 0, 4 ) );
   else
     return mktime ( $dH, $di, $ds,
-      substr ( $d, 4, 2 ),
-      substr ( $d, 6, 2 ),
-      substr ( $d, 0, 4 ) );
+      (int)substr ( $d, 4, 2 ),
+      (int)substr ( $d, 6, 2 ),
+      (int)substr ( $d, 0, 4 ) );
 }