diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-01-14 06:03:24 -0800 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-14 06:03:24 -0800 |
| commit | ab21c25e386b27f6dd1d21f7c84d183a97c202be (patch) | |
| tree | d2c9216dd38ca2c62d01eed41cc88d2c10066ce7 /apps/files_external | |
| parent | a2a5ed3f4f1d73ad62e2eb952d9bdde059eb454d (diff) | |
| parent | 1eb5ebd58c0eed26eb7988caaac63cabe940f51f (diff) | |
| download | nextcloud-server-ab21c25e386b27f6dd1d21f7c84d183a97c202be.tar.gz nextcloud-server-ab21c25e386b27f6dd1d21f7c84d183a97c202be.zip | |
Merge pull request #6759 from owncloud/extstorage-smbtimezonefix
Fixed timezone issue with SMB storage
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/3rdparty/smb4php/smb.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php index e454ddecb81..622942b052a 100644 --- a/apps/files_external/3rdparty/smb4php/smb.php +++ b/apps/files_external/3rdparty/smb4php/smb.php @@ -130,7 +130,7 @@ class smb { // this put env is necessary to read the output of smbclient correctly $old_locale = getenv('LC_ALL'); putenv('LC_ALL=en_US.UTF-8'); - $output = popen (SMB4PHP_SMBCLIENT." -N {$auth} {$options} {$port} {$options} {$params} 2>/dev/null", 'r'); + $output = popen ('TZ=UTC '.SMB4PHP_SMBCLIENT." -N {$auth} {$options} {$port} {$options} {$params} 2>/dev/null", 'r'); $gotInfo = false; $info = array (); $info['info']= array (); |