Skip to content

Fix date Format to use User Time Zone in PHP8 #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olivier-nolbert wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix date Format to use User Time Zone in PHP8 #769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions plugins/cck_field/calendar/calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,15 @@ public function onCCK_FieldPrepareStore( &$field, $value = '', &$config = array(
$locale = $this->setLocale();

// If data was created by script we have in fixed format, else we need to parse string
if ( $datasource == "computed" ) {
$date = JDate::createFromFormat( 'Y-m-d H:i:s', $value, $this->userTimeZone );
} else {
$date = JDate::createFromFormat( $options2['format'], $value, $this->userTimeZone );
}
// if ( $datasource == "computed" ) {
// $date = JDate::createFromFormat( 'Y-m-d H:i:s', $value, $this->userTimeZone );
// } else {
// $date = JDate::createFromFormat( $options2['format'], $value, $this->userTimeZone );
// }

//OCTOPOOS : Bloc if..then..else ci-dessus commenté et remplacé par celle ci-dessous suite passage à PHP8 et mauvais format de date (timezone non pris en compte)
//Cette modification n'impacte pas les sites encore en 7.4 qui continue à fonctionner de la même manière
$date = DateTime::createFromFormat( $datasource == "computed" ? 'Y-m-d H:i:s' : $options2['format'], $value, $this->userTimeZone );

if ( $date == false ) {
throw new OutOfBoundsException( 'You either used wrong format or locale set by language file is not supported on your server - ' .$locale );
Expand Down