Skip to content
Snippets Groups Projects
Commit e33fc280 authored by Thomas Müller's avatar Thomas Müller
Browse files

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

Removed broken tar cutter, added tar and fixed extension switch.
parents 6da9c094 cb842ba7
Branches
No related tags found
No related merge requests found
......@@ -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);
}
}
......
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment