cvs: php4 /pear/PEAR Common.php
| From: | Stig Bakken | Date: | Tue, 21 May 2002 01:20:51 +0000 |
| Subject: | cvs: php4 /pear/PEAR Common.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-3990@lists.php.net to get a copy of this message | ||
ssb Mon May 20 21:20:51 2002 EDT
Modified files:
/php4/pear/PEAR Common.php
Log:
* make infoFromAny actually work :)
Index: php4/pear/PEAR/Common.php
diff -u php4/pear/PEAR/Common.php:1.60 php4/pear/PEAR/Common.php:1.61
--- php4/pear/PEAR/Common.php:1.60 Mon May 20 06:45:23 2002
+++ php4/pear/PEAR/Common.php Mon May 20 21:20:51 2002
@@ -17,7 +17,7 @@
// | Tomas V.V.Cox <cox@idecnet.com> |
// +----------------------------------------------------------------------+
//
-// $Id: Common.php,v 1.60 2002/05/20 10:45:23 ssb Exp $
+// $Id: Common.php,v 1.61 2002/05/21 01:20:51 ssb Exp $
require_once 'PEAR.php';
require_once 'Archive/Tar.php';
@@ -128,7 +128,7 @@
*/
function PEAR_Common()
{
- $this->PEAR();
+ parent::PEAR();
$this->config = &PEAR_Config::singleton();
}
@@ -899,13 +899,13 @@
} elseif ($tmp == '.tar' || $tmp == '.tgz') {
$info = $this->infoFromTgzFile($info);
} else {
- $fp = fopen($params[0], "r");
+ $fp = fopen($info, "r");
$test = fread($fp, 5);
fclose($fp);
if ($test == "<?xml") {
- $info = $obj->infoFromDescriptionFile($info);
+ $info = $this->infoFromDescriptionFile($info);
} else {
- $info = $obj->infoFromTgzFile($info);
+ $info = $this->infoFromTgzFile($info);
}
}
if (PEAR::isError($info)) {