Skip to content

Commit

Permalink
Merge branch 'craigk5n:master' into elvis
Browse files Browse the repository at this point in the history
  • Loading branch information
bbannon authored Apr 14, 2024
2 parents 160a69a + 48cb0cf commit b9fb569
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion includes/classes/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );
}


Expand Down

0 comments on commit b9fb569

Please sign in to comment.