mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer-0.7

This commit is contained in:
Thomas Müller 2015-09-18 14:43:37 +02:00
parent 101fe59ce2 5db186e77c
commit eb41a4da7f
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit b94f7d38f6e13825fd34c7113827d3c369a689ad
Subproject commit 6b6575b04c01e30e5f38dbb373fd5166cce0ef54

5
lib/private/files.php
View File

@ -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();