diff options
author | leaneb <lea-e@bluewin.ch> | 2016-11-24 22:29:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-24 22:29:06 +0100 |
commit | 96728fedd76069175bcb3462b1fbdd38b47e00f7 (patch) | |
tree | 2bd52191c3e67c7117090be669bb76812d3151e1 /includes/pages | |
parent | 4116e0114e94f7c4ee5dba686c029b7e988bd7b3 (diff) | |
parent | 07e8d8dfbd9bdcfbaecf12894bc0e3cfb9e0126e (diff) |
Merge pull request #1 from engelsystem/master
Merge with Master
Diffstat (limited to 'includes/pages')
-rw-r--r-- | includes/pages/guest_login.php | 4 | ||||
-rw-r--r-- | includes/pages/user_settings.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index b7f85555..e0a32423 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -106,7 +106,7 @@ function guest_register() { $msg .= error(sprintf(_("Your password is too short (please use at least %s characters)."), MIN_PASSWORD_LENGTH), true); } - if (isset($_REQUEST['planned_arrival_date']) && $tmp = parse_date("Y-m-d", $_REQUEST['planned_arrival_date'])) { + if (isset($_REQUEST['planned_arrival_date']) && $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00")) { $planned_arrival_date = $tmp; } else { $valid = false; @@ -306,7 +306,7 @@ function guest_login() { } } else { $valid = false; - error(_("No user was found with that Nickname. Please try again. If you are still having problems, ask an Dispatcher.")); + error(_("No user was found with that Nickname. Please try again. If you are still having problems, ask a Dispatcher.")); } } else { $valid = false; diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index 02c61a20..a147b437 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -44,7 +44,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) { } if (isset($_REQUEST['planned_arrival_date'])) { - $tmp = parse_date("Y-m-d", $_REQUEST['planned_arrival_date']); + $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00"); $result = User_validate_planned_arrival_date($tmp); $user_source['planned_arrival_date'] = $result->getValue(); if (! $result->isValid()) { @@ -54,7 +54,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) { } if (isset($_REQUEST['planned_departure_date'])) { - $tmp = parse_date("Y-m-d", $_REQUEST['planned_departure_date']); + $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_departure_date'] . " 00:00"); $result = User_validate_planned_departure_date($user_source['planned_arrival_date'], $tmp); $user_source['planned_departure_date'] = $result->getValue(); if (! $result->isValid()) { |