[geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.32, 1.33

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv32237/public_html/admin/install

Modified Files:
	index.php 
Log Message:
Need to re-read the db-config.php in case we get conflicting DB settings from an old config.php (assuming the ones the user just entered in the install script are the correct settings)


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** index.php	3 Feb 2008 09:54:50 -0000	1.32
--- index.php	16 Mar 2008 11:30:28 -0000	1.33
***************
*** 948,952 ****
  function INST_doDatabaseUpgrades($current_gl_version, $use_innodb = false)
  {
!     global $_TABLES, $_CONF, $_SP_CONF, $_DB, $_DB_dbms, $_DB_table_prefix, $siteconfig_path, $html_path;
  
      $_DB->setDisplayError (true);
--- 948,953 ----
  function INST_doDatabaseUpgrades($current_gl_version, $use_innodb = false)
  {
!     global $_TABLES, $_CONF, $_SP_CONF, $_DB, $_DB_dbms, $_DB_table_prefix,
!            $dbconfig_path, $siteconfig_path, $html_path;
  
      $_DB->setDisplayError (true);
***************
*** 1283,1287 ****
                      $config->set($key, $val);
                  }
!                 require($siteconfig_path);
              }
  
--- 1284,1289 ----
                      $config->set($key, $val);
                  }
!                 require $siteconfig_path;
!                 require $dbconfig_path;
              }