[Pkg-owncloud-commits] [owncloud] 78/104: Fixed timezone issue with SMB storage

David Prévot taffit at moszumanska.debian.org
Sat Jan 18 13:33:41 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 8ef32821bea66a0ef3be9c63f3e7f8d314191dec
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue Jan 14 00:37:57 2014 +0100

    Fixed timezone issue with SMB storage
    
    Now forcing smbclient to also run on UTC
    
    Backport of 1eb5ebd to stable6
---
 apps/files_external/3rdparty/smb4php/smb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php
index 6c91a6e..cf7e55c 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 ();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list