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

Merge pull request #10142 from owncloud/fix-#9283-gzip_support 

Removed broken tar cutter, added tar and fixed extension switch.
This commit is contained in:
Thomas Müller 2014-08-07 14:53:31 +02:00
parent 6da9c09467 cb842ba793
commit e33fc2807c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/archive.php
View File

@ -20,11 +20,8 @@ abstract class OC_Archive{
case '.gz':
case '.bz':
case '.bz2':
if(strpos($path, '.tar.')) {
return new OC_Archive_TAR($path);
}
break;
case '.tgz':
case '.tar':
return new OC_Archive_TAR($path);
}
}

10
lib/private/archive/tar.php
View File

@ -40,12 +40,14 @@ class OC_Archive_TAR extends OC_Archive{
if(strpos($file, '.')) {
$extension=substr($file, strrpos($file, '.'));
switch($extension) {
case 'gz':
case 'tgz':
case '.gz':
case '.tgz':
return self::GZIP;
case 'bz':
case 'bz2':
case '.bz':
case '.bz2':
return self::BZIP;
case '.tar':
return self::PLAIN;
default:
return self::PLAIN;
}