Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2457251 by vijaycs85: Remove unnecessary call to drupal_get_user_timezone() in Drupal/Core/Datetime/DrupalDateTime::prepareTimezone() method

8.0.x
Alex Pott 2015-03-24 11:35:18 +00:00
parent e73ce6ea00
commit 47e418fee2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Drupal/Core/Datetime/DrupalDateTime.php
View File

@ -62,9 +62,9 @@ class DrupalDateTime extends DateTimePlus {
* knowledge of the preferred user timezone. * knowledge of the preferred user timezone.
*/ */
protected function prepareTimezone($timezone) { protected function prepareTimezone($timezone) {
$user_timezone = drupal_get_user_timezone(); if (empty($timezone)) {
if (empty($timezone) && !empty($user_timezone)) { // Fallback to user or system default timezone.
$timezone = $user_timezone; $timezone = drupal_get_user_timezone();
} }
return parent::prepareTimezone($timezone); return parent::prepareTimezone($timezone);
} }