diff options
| author | Robin Appelman <robin@icewind.nl> | 2018-08-22 14:22:52 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2018-08-23 16:10:42 +0200 |
| commit | 05131490a75d1a33ba40fbf975c0bd79607702c8 (patch) | |
| tree | 9f6fa7de93862b990705bd3fb556b8099222cf91 /apps | |
| parent | 48f39628d0f4b32233575e79678f9c42bc010377 (diff) | |
| download | nextcloud-server-05131490a75d1a33ba40fbf975c0bd79607702c8.tar.gz nextcloud-server-05131490a75d1a33ba40fbf975c0bd79607702c8.zip | |
improved fallback of timezone detection
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php b/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php index fcdf7e3e879..8d53c0d5f06 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php +++ b/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php @@ -41,7 +41,10 @@ class TimeZoneProvider { escapeshellarg($this->host) ); $this->timeZone = exec($command); - } else { // fallback to server timezone + } + + if (!$this->timeZone) { + // fallback to server timezone $this->timeZone = date_default_timezone_get(); } } |