summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-09-18 14:43:37 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-09-18 14:43:37 +0200
commiteb41a4da7f347951f8aeb6b5a583a27972e2927d (patch)
tree481ca82143c81a09bbd5ca734fc37fc46ec027f3 /lib
parent101fe59ce2822652b59383699626b14024b45553 (diff)
parent5db186e77c2eddb62b444b4f5cb56a92c02db6ee (diff)
downloadnextcloud-server-eb41a4da7f347951f8aeb6b5a583a27972e2927d.tar.gz
nextcloud-server-eb41a4da7f347951f8aeb6b5a583a27972e2927d.zip
Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer-0.7
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/private/files.php b/lib/private/files.php
index 0172f1ca6af..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/ZipStreamer.php';
-
use OC\Lock\NoopLockingProvider;
use OCP\Lock\ILockingProvider;
@@ -121,7 +118,7 @@ class OC_Files {
if ($get_type === self::FILE) {
$zip = false;
} else {
- $zip = new ZipStreamer(false);
+ $zip = new ZipStreamer\ZipStreamer();
}
OC_Util::obEnd();