diff options
author | nikrou <nikrou@piwigo.org> | 2010-03-21 12:32:49 +0000 |
---|---|---|
committer | nikrou <nikrou@piwigo.org> | 2010-03-21 12:32:49 +0000 |
commit | 85c1c1b1ea1cdbb6c6903e0cec11d86a79f750ad (patch) | |
tree | 7fa762080a234a4fd1527f4c3d36ce87c3f3be4b /upgrade.php | |
parent | 76b2701e1654e4539136822fda834a7b8262083b (diff) |
Feature 1522 : move database config file to local directory
(include/config_database.inc.php becomes local/config/database.inc.php)
git-svn-id: http://piwigo.org/svn/trunk@5213 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | upgrade.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/upgrade.php b/upgrade.php index e4b92834d..7063bf6b0 100644 --- a/upgrade.php +++ b/upgrade.php @@ -24,7 +24,7 @@ define('PHPWG_ROOT_PATH', './'); // load config file -$config_file = PHPWG_ROOT_PATH.'include/config_database.inc.php'; +$config_file = PHPWG_ROOT_PATH.'local/config/database.inc.php'; $config_file_contents = @file_get_contents($config_file); if ($config_file_contents === false) { @@ -40,7 +40,7 @@ include_once(PHPWG_ROOT_PATH.'include/functions.inc.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php'); -include(PHPWG_ROOT_PATH.'include/config_database.inc.php'); +include(PHPWG_ROOT_PATH.'local/config/database.inc.php'); include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php'); include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); @@ -267,7 +267,7 @@ if (isset($_POST['submit']) and check_upgrade()) $conf['die_on_sql_error'] = false; include($upgrade_file); - // Something to add in config_database.inc.php? + // Something to add in database.inc.php? if (!empty($mysql_changes)) { $config_file_contents = @@ -279,7 +279,7 @@ if (isset($_POST['submit']) and check_upgrade()) { array_push($page['infos'], l10n_args('in <i>%s</i>, before <b>?></b>, insert:', - 'include/config_database.inc.php') . + 'local/config/database.inc.php') . '<p><textarea rows="4" cols="40">' . implode("\r\n" , $mysql_changes).'</textarea></p>' ); |