cvs: pear-core /PEAR Config.php
| From: | Greg Beaver | Date: | Sun, 20 Feb 2005 16:57:11 +0000 |
| Subject: | cvs: pear-core /PEAR Config.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-29538@lists.php.net to get a copy of this message | ||
cellog Sun Feb 20 11:57:11 2005 EDT
Modified files:
/pear-core/PEAR Config.php
Log:
add registry for default config, just in case this works
http://cvs.php.net/diff.php/pear-core/PEAR/Config.php?r1=1.92&r2=1.93&ty=u
Index: pear-core/PEAR/Config.php
diff -u pear-core/PEAR/Config.php:1.92 pear-core/PEAR/Config.php:1.93
--- pear-core/PEAR/Config.php:1.92 Sun Feb 20 11:45:04 2005
+++ pear-core/PEAR/Config.php Sun Feb 20 11:57:10 2005
@@ -17,7 +17,7 @@
// | Greg Beaver <cellog@php.net> |
// +----------------------------------------------------------------------+
//
-// $Id: Config.php,v 1.92 2005/02/20 16:45:04 cellog Exp $
+// $Id: Config.php,v 1.93 2005/02/20 16:57:10 cellog Exp $
require_once 'PEAR.php';
require_once 'PEAR/Registry.php';
@@ -534,6 +534,9 @@
foreach ($this->configuration_info as $key => $info) {
$this->configuration['default'][$key] = $info['default'];
}
+ $this->_registry['default'] = &new PEAR_Registry($phpdir);
+ $this->_registry['default']->setConfig($this);
+ $this->_regInitialized['default'] = false;
//$GLOBALS['_PEAR_Config_instance'] = &$this;
}
@@ -1752,6 +1755,8 @@
return $this->_registry[$layer];
} elseif ($layer == 'user' &&
isset($this->_registry['system'])) {
return $this->_registry['system'];
+ } elseif ($layer == 'user' &&
isset($this->_registry['default'])) {
+ return $this->_registry['default'];
} else {
$a = false;
return $a;