summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Bakken <ssb@php.net>2002-05-27 21:36:28 +0000
committerStig Bakken <ssb@php.net>2002-05-27 21:36:28 +0000
commit216986ff42b5646c6d7ec6038ef8e2fb8e9e0d01 (patch)
tree1b28caa852ef7936126bd5c8ab408e16ceb0746e
parent1794f9c9221ccae119bb2c0b739d5cb6332a7017 (diff)
downloadphp-git-216986ff42b5646c6d7ec6038ef8e2fb8e9e0d01.tar.gz
* use new Archive_Tar gzip autodetection
-rw-r--r--pear/PEAR/Common.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/pear/PEAR/Common.php b/pear/PEAR/Common.php
index f244a03660..2e33375d63 100644
--- a/pear/PEAR/Common.php
+++ b/pear/PEAR/Common.php
@@ -672,12 +672,7 @@ class PEAR_Common extends PEAR
if (!@is_file($file)) {
return $this->raiseError("tgz :: could not open file \"$file\"");
}
- if (substr($file, -4) == '.tar') {
- $compress = false;
- } else {
- $compress = true;
- }
- $tar = new Archive_Tar($file, $compress);
+ $tar = new Archive_Tar($file);
$content = $tar->listContent();
if (!is_array($content)) {
return $this->raiseError("tgz :: could not get contents of package \"$file\"");
@@ -1519,7 +1514,6 @@ class PEAR_Common extends PEAR
if ($callback) {
call_user_func($callback, 'done', $bytes);
}
- // callback: done!
return $dest_file;
}