summaryrefslogtreecommitdiffstats
path: root/apps/files_external
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2018-08-22 14:22:52 +0200
committerRobin Appelman <robin@icewind.nl>2018-08-23 16:09:33 +0200
commit50463e2d13acdeaf6bb2fd9973c597ae40642dbb (patch)
treedd005655940d89008b71fa3f771933e38a6d80be /apps/files_external
parentc1389070fad5c84158d46ca784ba5e63af88d283 (diff)
downloadnextcloud-server-50463e2d13acdeaf6bb2fd9973c597ae40642dbb.tar.gz
nextcloud-server-50463e2d13acdeaf6bb2fd9973c597ae40642dbb.zip
improved fallback of timezone detection
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/files_external')
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php5
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..4438ee5bf7c 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();
}
}