From be2023dae34ff9178e6395ab53d90b5e2d0d1b55 Mon Sep 17 00:00:00 2001 From: Nicolai Ehemann Date: Thu, 3 Apr 2014 15:39:19 +0200 Subject: [PATCH 1/3] lib/private/files.php: adapted to minimally changed ZipStreamer API --- 3rdparty | 2 +- lib/private/files.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty b/3rdparty index b94f7d38f6..0f862d433a 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit b94f7d38f6e13825fd34c7113827d3c369a689ad +Subproject commit 0f862d433ad146ebca97e356c703369777c2a30f diff --git a/lib/private/files.php b/lib/private/files.php index 0172f1ca6a..ec586a7a08 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(); From 6c6be72e6bedce42082b4955e36eb1ad1fb8cfdd Mon Sep 17 00:00:00 2001 From: Nicolai Ehemann Date: Mon, 14 Sep 2015 15:33:28 +0200 Subject: [PATCH 2/3] use zipstreamer via composer --- 3rdparty | 2 +- lib/private/files.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/3rdparty b/3rdparty index 0f862d433a..70d9c4096e 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 ec586a7a08..658e708e5d 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; From 5db186e77c2eddb62b444b4f5cb56a92c02db6ee Mon Sep 17 00:00:00 2001 From: Nicolai Ehemann Date: Fri, 18 Sep 2015 13:42:36 +0200 Subject: [PATCH 3/3] adapted to changed subproject commit --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index 70d9c4096e..6b6575b04c 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 70d9c4096e767b4103960ffad96b87e3e511ee61 +Subproject commit 6b6575b04c01e30e5f38dbb373fd5166cce0ef54