From: Tomas V.V.Cox <cox@php.net>
Date: Mon, 16 Jun 2003 07:44:46 +0000 (+0000)
Subject: Do not create the registry obj at Installer object creation
X-Git-Tag: RELEASE_1_0_2~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d335b38a375e293aa6e5ff2ee3556525026eac66;p=php

Do not create the registry obj at Installer object creation
(it's problematic when pear install -R <DIR> is used)
---

diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
index 62238d8aee..4ac1d33620 100644
--- a/pear/PEAR/Installer.php
+++ b/pear/PEAR/Installer.php
@@ -117,7 +117,7 @@ class PEAR_Installer extends PEAR_Common
         parent::PEAR_Common();
         $this->setFrontendObject($ui);
         $this->debug = $this->config->get('verbose');
-        $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
+        //$this->registry = &new PEAR_Registry($this->config->get('php_dir'));
     }
 
     // }}}
@@ -801,6 +801,9 @@ class PEAR_Installer extends PEAR_Common
      */
     function checkDeps(&$pkginfo, &$errors)
     {
+        if (empty($this->registry)) {
+            $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
+        }
         $depchecker = &new PEAR_Dependency($this->registry);
         $error = $errors = '';
         $failed_deps = $optional_deps = array();