equal
deleted
inserted
replaced
206 |
206 |
207 // The first thing we need to do is start the database connection. At this point, for all we know, Enano might not |
207 // The first thing we need to do is start the database connection. At this point, for all we know, Enano might not |
208 // even be installed. If this connection attempt fails and it's because of a missing or corrupt config file, the |
208 // even be installed. If this connection attempt fails and it's because of a missing or corrupt config file, the |
209 // user will be redirected (intelligently) to install.php. |
209 // user will be redirected (intelligently) to install.php. |
210 |
210 |
211 $config_file = ( defined('IN_ENANO_INSTALL') ) ? '/config.new.php' : '/config.php'; |
211 $config_file = ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') ) ? '/config.new.php' : '/config.php'; |
212 @include(ENANO_ROOT . $config_file); |
212 @include(ENANO_ROOT . $config_file); |
213 unset($dbuser, $dbpasswd); |
213 unset($dbuser, $dbpasswd); |
214 if ( !isset($dbdriver) ) |
214 if ( !isset($dbdriver) ) |
215 $dbdriver = 'mysql'; |
215 $dbdriver = 'mysql'; |
216 |
216 |