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:
commit
e33fc2807c
|
@ -20,11 +20,8 @@ abstract class OC_Archive{
|
||||||
case '.gz':
|
case '.gz':
|
||||||
case '.bz':
|
case '.bz':
|
||||||
case '.bz2':
|
case '.bz2':
|
||||||
if(strpos($path, '.tar.')) {
|
|
||||||
return new OC_Archive_TAR($path);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case '.tgz':
|
case '.tgz':
|
||||||
|
case '.tar':
|
||||||
return new OC_Archive_TAR($path);
|
return new OC_Archive_TAR($path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,12 +40,14 @@ class OC_Archive_TAR extends OC_Archive{
|
||||||
if(strpos($file, '.')) {
|
if(strpos($file, '.')) {
|
||||||
$extension=substr($file, strrpos($file, '.'));
|
$extension=substr($file, strrpos($file, '.'));
|
||||||
switch($extension) {
|
switch($extension) {
|
||||||
case 'gz':
|
case '.gz':
|
||||||
case 'tgz':
|
case '.tgz':
|
||||||
return self::GZIP;
|
return self::GZIP;
|
||||||
case 'bz':
|
case '.bz':
|
||||||
case 'bz2':
|
case '.bz2':
|
||||||
return self::BZIP;
|
return self::BZIP;
|
||||||
|
case '.tar':
|
||||||
|
return self::PLAIN;
|
||||||
default:
|
default:
|
||||||
return self::PLAIN;
|
return self::PLAIN;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue