improved fallback of timezone detection

icewind1991 · icewind1991 · commit 46c679ff8c41 · 2018-08-22T14:22:52.000+02:00
Signed-off-by: Robin Appelman &lt;robin@icewind.nl&gt;
diff --git a/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php b/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php
@@ -41,9 +41,10 @@ public function get() {
 					escapeshellarg($this->host)
 				);
 				$this->timeZone = exec($command);
-			} else { // fallback to server timezone
-				$this->timeZone = date_default_timezone_get();
 			}
+
+			// fallback to server timezone
+			$this->timeZone = date_default_timezone_get();
 		}
 		return $this->timeZone;
 	}

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,10 @@ public function get() {`
`41`	`41`	`escapeshellarg($this->host)`
`42`	`42`	`);`
`43`	`43`	`$this->timeZone = exec($command);`
`44`		`- } else { // fallback to server timezone`
`45`		`- $this->timeZone = date_default_timezone_get();`
`46`	`44`	`}`
	`45`	`+`
	`46`	`+ // fallback to server timezone`
	`47`	`+ $this->timeZone = date_default_timezone_get();`
`47`	`48`	`}`
`48`	`49`	`return $this->timeZone;`
`49`	`50`	`}`