From be2023dae34ff9178e6395ab53d90b5e2d0d1b55 Mon Sep 17 00:00:00 2001 From: Nicolai Ehemann Date: Thu, 3 Apr 2014 15:39:19 +0200 Subject: lib/private/files.php: adapted to minimally changed ZipStreamer API --- lib/private/files.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/private/files.php') diff --git a/lib/private/files.php b/lib/private/files.php index 0172f1ca6af..ec586a7a08a 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -41,7 +41,7 @@ */ // TODO: get rid of this using proper composer packages -require_once 'mcnetic/phpzipstreamer/ZipStreamer.php'; +require_once 'mcnetic/phpzipstreamer/src/ZipStreamer.php'; use OC\Lock\NoopLockingProvider; use OCP\Lock\ILockingProvider; @@ -121,7 +121,7 @@ class OC_Files { if ($get_type === self::FILE) { $zip = false; } else { - $zip = new ZipStreamer(false); + $zip = new ZipStreamer\ZipStreamer(); } OC_Util::obEnd(); -- cgit v1.2.3 From 6c6be72e6bedce42082b4955e36eb1ad1fb8cfdd Mon Sep 17 00:00:00 2001 From: Nicolai Ehemann Date: Mon, 14 Sep 2015 15:33:28 +0200 Subject: use zipstreamer via composer --- 3rdparty | 2 +- lib/private/files.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/private/files.php') diff --git a/3rdparty b/3rdparty index 0f862d433ad..70d9c4096e7 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 0f862d433ad146ebca97e356c703369777c2a30f +Subproject commit 70d9c4096e767b4103960ffad96b87e3e511ee61 diff --git a/lib/private/files.php b/lib/private/files.php index ec586a7a08a..658e708e5de 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -40,9 +40,6 @@ * */ -// TODO: get rid of this using proper composer packages -require_once 'mcnetic/phpzipstreamer/src/ZipStreamer.php'; - use OC\Lock\NoopLockingProvider; use OCP\Lock\ILockingProvider; -- cgit v1.2.3