[Pkg-owncloud-commits] [owncloud] 28/34: Add darwin to if block

David Prévot taffit at moszumanska.debian.org
Fri Oct 17 01:32:18 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 f53ecea3725bf1303171f224cd5864c9d9da3408
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Tue Oct 14 12:58:00 2014 +0200

    Add darwin to if block
    
    Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
---
 lib/private/largefilehelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php
index 87a08e8..806e6e7 100644
--- a/lib/private/largefilehelper.php
+++ b/lib/private/largefilehelper.php
@@ -151,7 +151,7 @@ class LargeFileHelper {
 			$result = '';
 			if (strpos($os, 'linux') !== false) {
 				$result = $this->exec("stat -c %s $arg");
-			} else if (strpos($os, 'bsd') !== false) {
+			} else if (strpos($os, 'bsd') !== false || strpos($os, 'darwin') !== false) {
 				$result = $this->exec("stat -f %z $arg");
 			} else if (strpos($os, 'win') !== false) {
 				$result = $this->exec("for %F in ($arg) do @echo %~zF");

-- 
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