diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2017-01-30 18:01:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 18:01:06 +0100 |
| commit | f70f427a631436f22eb90f01f74f2e2996cbf75f (patch) | |
| tree | 9b2e5b3284d283fbf9d0e5289ed91783c2761ab8 /lib | |
| parent | 64e9a1aec09bd24fe411e75df710b99dcb67bc86 (diff) | |
| parent | 6fd7d4efd0329058bd51c5fa038b2df7188b57b2 (diff) | |
| download | nextcloud-server-f70f427a631436f22eb90f01f74f2e2996cbf75f.tar.gz nextcloud-server-f70f427a631436f22eb90f01f74f2e2996cbf75f.zip | |
Merge pull request #3298 from nextcloud/downstream-26928
remove obsolete hack (#26928)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/Storage/Local.php | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index 4fe7dcafbbf..80d48680be1 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -205,18 +205,7 @@ class Local extends \OC\Files\Storage\Common { } public function file_get_contents($path) { - // file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961 - $fileName = $this->getSourcePath($path); - - $fileSize = filesize($fileName); - if ($fileSize === 0) { - return ''; - } - - $handle = fopen($fileName, 'rb'); - $content = fread($handle, $fileSize); - fclose($handle); - return $content; + return file_get_contents($this->getSourcePath($path)); } public function file_put_contents($path, $data) { |