cvs: pear-core / install-pear.php

cellog		Tue May 13 04:58:09 2008 UTC

  Modified files:              
    /pear-core	install-pear.php 
  Log:
  fix Bug #13257 install-pear.php does not set cfg_dir or www_dir
  
http://cvs.php.net/viewvc.cgi/pear-core/install-pear.php?r1=1.31&r2=1.32&diff_format=u
Index: pear-core/install-pear.php
diff -u pear-core/install-pear.php:1.31 pear-core/install-pear.php:1.32
--- pear-core/install-pear.php:1.31	Tue Mar 11 22:04:32 2008
+++ pear-core/install-pear.php	Tue May 13 04:58:09 2008
@@ -1,6 +1,6 @@
 <?php
 
-/* $Id: install-pear.php,v 1.31 2008/03/11 22:04:32 timj Exp $ */
+/* $Id: install-pear.php,v 1.32 2008/05/13 04:58:09 cellog Exp $ */
 
 error_reporting(E_ALL);
 $pear_dir = dirname(__FILE__);
@@ -94,7 +94,11 @@
     $config->set('php_dir', $with_dir, 'default');
     $config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
     $config->set('data_dir', $with_dir . $ds . 'data', 'default');
+    $config->set('www_dir', $with_dir . $ds . 'htdocs', 'default');
     $config->set('test_dir', $with_dir . $ds . 'test', 'default');
+    if (!empty($cfg_dir)) {
+        $config->set('cfg_dir', $with_dir . $ds . 'cfg', 'default');
+    }
     if (!is_writable($config->get('cache_dir'))) {
         include_once 'System.php';
         $cdir = System::mktemp(array('-d', 'pear'));