diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-10-25 12:25:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-25 12:25:41 +0200 |
commit | 324e5b02ba7ee0610f4de5e708987d7907bb1db5 (patch) | |
tree | d767704df3d58111a42d789c476f885bcbf4d6e7 /lib | |
parent | e23a298a8155fb8f74c1ee2fcbef31a418b65db4 (diff) | |
parent | df3444493b02398e235f0af1f0069425f1b156aa (diff) | |
download | nextcloud-server-324e5b02ba7ee0610f4de5e708987d7907bb1db5.tar.gz nextcloud-server-324e5b02ba7ee0610f4de5e708987d7907bb1db5.zip |
Merge pull request #1902 from nextcloud/fix-largefile-helper-not-existent
Remove not existent function call
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Files/Storage/Local.php | 2 | ||||
-rw-r--r-- | lib/private/LargeFileHelper.php | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index 0d63fd46ecc..bda7f2ea903 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -155,7 +155,7 @@ class Local extends \OC\Files\Storage\Common { $fullPath = $this->getSourcePath($path); if (PHP_INT_SIZE === 4) { $helper = new \OC\LargeFileHelper; - return $helper->getFilesize($fullPath); + return $helper->getFileSize($fullPath); } return filesize($fullPath); } diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php index 9d0fe864033..4363fb42cc6 100644 --- a/lib/private/LargeFileHelper.php +++ b/lib/private/LargeFileHelper.php @@ -51,7 +51,7 @@ class LargeFileHelper { public function __construct() { $pow_2_53 = floatval(self::POW_2_53_MINUS_1) + 1.0; if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) { - throw new \RunTimeException( + throw new \RuntimeException( 'This class assumes floats to be double precision or "better".' ); } @@ -98,10 +98,6 @@ class LargeFileHelper { if (!is_null($fileSize)) { return $fileSize; } - $fileSize = $this->getFileSizeViaCOM($filename); - if (!is_null($fileSize)) { - return $fileSize; - } $fileSize = $this->getFileSizeViaExec($filename); if (!is_null($fileSize)) { return $fileSize; @@ -154,12 +150,6 @@ class LargeFileHelper { $result = $this->exec("stat -c %s $arg"); } 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"); - if (is_null($result)) { - // PowerShell - $result = $this->exec("(Get-Item $arg).length"); - } } return $result; } |