From 7b25308e7392a028dc7573d6593e398748534b1a Mon Sep 17 00:00:00 2001 From: patdenice Date: Fri, 26 Mar 2010 16:49:23 +0000 Subject: Fix php5 apache configuration with upgrade. git-svn-id: http://piwigo.org/svn/trunk@5387 68402e56-0260-453c-a942-63ccdbb3a9ee --- install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index 9314253ef..2742a16ce 100644 --- a/install.php +++ b/install.php @@ -183,7 +183,6 @@ elseif (@file_exists($config_file)) include(PHPWG_ROOT_PATH . 'include/constants.php'); include(PHPWG_ROOT_PATH . 'include/functions.inc.php'); include(PHPWG_ROOT_PATH . 'admin/include/functions.php'); -include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php'); include(PHPWG_ROOT_PATH . 'admin/include/languages.class.php'); $languages = new languages('utf-8'); @@ -259,10 +258,11 @@ if (!isset($step)) //---------------------------------------------------------------- form analyze include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php'); include(PHPWG_ROOT_PATH . 'admin/include/functions_install.inc.php'); +include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php'); if ( isset( $_POST['install'] )) { - if (try_db_connection($infos, $errors)) + if (install_db_connect($infos, $errors)) { $required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION'); if ( version_compare(pwg_get_db_version(), $required_version, '>=') ) -- cgit v1.2.3