diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php index 0158eac4b580ff4c2a1f5e563909559da145d6cb..457b73e84703c248ef575b3e97cdc751f7e7cc1b 100644 --- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php +++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php @@ -250,7 +250,11 @@ public static function createFromFormat($format, $time, $timezone = NULL, $setti * (optional) A date/time string. Defaults to 'now'. * @param mixed $timezone * (optional) \DateTimeZone object, time zone string or NULL. NULL uses the - * default system time zone. Defaults to NULL. + * default system time zone. Defaults to NULL. Note that the $timezone + * parameter and the current timezone are ignored when the $time parameter + * either is a UNIX timestamp (e.g. @946684800) or specifies a timezone + * (e.g. 2010-01-28T15:00:00+02:00). + * @see http://php.net/manual/en/datetime.construct.php * @param array $settings * (optional) Keyed array of settings. Defaults to empty array. * - langcode: (optional) String two letter language code used to control diff --git a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php index 572a6e3c6620910781b18fcbf02423d0e05ed2df..d5fdbe22b9ff0c42de105957a0a3fc32897de924 100644 --- a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php +++ b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php @@ -34,7 +34,11 @@ class DrupalDateTime extends DateTimePlus { * A date/input_time_adjusted string. Defaults to 'now'. * @param mixed $timezone * PHP DateTimeZone object, string or NULL allowed. - * Defaults to NULL. + * Defaults to NULL. Note that the $timezone parameter and the current + * timezone are ignored when the $time parameter either is a UNIX timestamp + * (e.g. @946684800) or specifies a timezone + * (e.g. 2010-01-28T15:00:00+02:00). + * @see http://php.net/manual/en/datetime.construct.php * @param array $settings * - validate_format: (optional) Boolean choice to validate the * created date using the input format. The format used in