# HG changeset patch
# User Dan
# Date 1261191602 18000
# Node ID 774ae986fded75320b775460f441157c27781151
# Parent  5daef5ddc08ca9b28a978cdeaa3dd4db640f7b90
Backout from 1.1.7 due to upgrade issue, fixed and retagging

diff -r 5daef5ddc08c -r 774ae986fded .hgtags
--- a/.hgtags	Fri Dec 18 21:49:48 2009 -0500
+++ b/.hgtags	Fri Dec 18 22:00:02 2009 -0500
@@ -8,4 +8,3 @@
 3214f493c0dba43230579a1f1ec6bc7957cd2955 1.1.4
 9a0d042289014b6d6c8db7e50a4546d34e06bf5c 1.1.5
 07a26bd567a50ecfa831eed8ccfeb2f014d93938 1.1.6
-2cb6d70867767337162357c250951c78bf32b6d4 1.1.7
diff -r 5daef5ddc08c -r 774ae986fded includes/common.php
--- a/includes/common.php	Fri Dec 18 21:49:48 2009 -0500
+++ b/includes/common.php	Fri Dec 18 22:00:02 2009 -0500
@@ -208,7 +208,7 @@
 // even be installed. If this connection attempt fails and it's because of a missing or corrupt config file, the
 // user will be redirected (intelligently) to install.php.
 
-$config_file = ( defined('IN_ENANO_INSTALL') ) ? '/config.new.php' : '/config.php';
+$config_file = ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') ) ? '/config.new.php' : '/config.php';
 @include(ENANO_ROOT . $config_file);
 unset($dbuser, $dbpasswd);
 if ( !isset($dbdriver) )