cvs: pear-core /PEAR2 Config.php
| From: | Greg Beaver | Date: | Fri, 29 Dec 2006 18:50:29 +0000 |
| Subject: | cvs: pear-core /PEAR2 Config.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-core+get-5319@lists.php.net to get a copy of this message | ||
cellog Fri Dec 29 18:50:29 2006 UTC
Modified files:
/pear-core/PEAR2 Config.php
Log:
do path corrections after locating file
http://cvs.php.net/viewvc.cgi/pear-core/PEAR2/Config.php?r1=1.3&r2=1.4&diff_format=u
Index: pear-core/PEAR2/Config.php
diff -u pear-core/PEAR2/Config.php:1.3 pear-core/PEAR2/Config.php:1.4
--- pear-core/PEAR2/Config.php:1.3 Fri Dec 29 18:46:56 2006
+++ pear-core/PEAR2/Config.php Fri Dec 29 18:50:29 2006
@@ -241,9 +241,6 @@
function saveConfig($userfile = false)
{
- $userfile = str_replace('\\', '/', $userfile);
- $userfile = str_replace('//', '/', $userfile);
- $userfile = str_replace('/', DIRECTORY_SEPARATOR, $userfile);
if (!$userfile) {
if (class_exists('COM')) {
$userfile = $this->_locateLocalSettingsDirectory() . DIRECTORY_SEPARATOR .
@@ -253,6 +250,9 @@
'.pear' . DIRECTORY_SEPARATOR . 'pearconfig.xml';
}
}
+ $userfile = str_replace('\\', '/', $userfile);
+ $userfile = str_replace('//', '/', $userfile);
+ $userfile = str_replace('/', DIRECTORY_SEPARATOR, $userfile);
$x = simplexml_load_string('<pearconfig
version="1.0"></pearconfig>');
foreach (self::$userConfigNames as $var) {
$x->$var = $this->$var;