summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas V.V.Cox <cox@php.net>2003-08-04 13:31:35 +0000
committerTomas V.V.Cox <cox@php.net>2003-08-04 13:31:35 +0000
commitb4f107740309f736f050061ee178769b98e434de (patch)
tree3587dbcd881b2cea77be344df8f9450615b0027b
parent294fcddc0ecdbc01e33f88647b1d75346cc8a0bc (diff)
downloadphp-git-b4f107740309f736f050061ee178769b98e434de.tar.gz
More space in path name fixes (Greg)
-rw-r--r--pear/PEAR/Common.php3
-rw-r--r--pear/PEAR/Installer.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/pear/PEAR/Common.php b/pear/PEAR/Common.php
index 6676f02a9c..a0f3685993 100644
--- a/pear/PEAR/Common.php
+++ b/pear/PEAR/Common.php
@@ -693,6 +693,9 @@ class PEAR_Common extends PEAR
}
$tmpdir = System::mkTemp('-d pear');
$this->addTempFile($tmpdir);
+ if (!is_array($xml)) {
+ $xml = array($xml);
+ }
if (!$xml || !$tar->extractList($xml, $tmpdir)) {
return $this->raiseError('could not extract the package.xml file');
}
diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
index 9f95e25aa6..6f6deadf65 100644
--- a/pear/PEAR/Installer.php
+++ b/pear/PEAR/Installer.php
@@ -552,7 +552,7 @@ class PEAR_Installer extends PEAR_Common
$this->log(2, '+ tmp dir created at ' . $tmpdir);
$tar = new Archive_Tar($pkgfile);
- if (!@$tar->extract($tmpdir)) {
+ if (!@$tar->extract(array($tmpdir))) {
return $this->raiseError("unable to unpack $pkgfile");
}