aboutsummaryrefslogtreecommitdiffstats
path: root/upgrade_feed.php
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2009-11-16 19:17:01 +0000
committernikrou <nikrou@piwigo.org>2009-11-16 19:17:01 +0000
commit8a299654501db00316a56efda76448a6bb3975e1 (patch)
treeb34f9693380c3e4a69d7c9c45c011fb327560be1 /upgrade_feed.php
parent9a773f003c2c88f3916942b65c36912ff81cecf6 (diff)
Feature 928 resolved.
Replace include/mysql.inc.php by include/config_database.inc.php to be independant of database engine Rename database configurations variables by ones in $conf array. git-svn-id: http://piwigo.org/svn/trunk@4280 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--upgrade_feed.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/upgrade_feed.php b/upgrade_feed.php
index 4d70d66bb..21b10393d 100644
--- a/upgrade_feed.php
+++ b/upgrade_feed.php
@@ -32,7 +32,7 @@ define('PHPWG_ROOT_PATH', './');
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/mysql.inc.php');
+include(PHPWG_ROOT_PATH.'include/config_database.inc.php');
include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
@@ -54,8 +54,8 @@ define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db');
// | Database connection |
// +-----------------------------------------------------------------------+
-mysql_connect($cfgHote, $cfgUser, $cfgPassword) or die("Could not connect to database server");
-mysql_select_db($cfgBase) or die("Could not connect to database");
+mysql_connect($conf['db_host'], $conf['db_user'], $conf['db_password']) or die("Could not connect to database server");
+mysql_select_db($conf['db_base']) or die("Could not connect to database");
if ( version_compare(mysql_get_server_info(), '4.1.0', '>=')
and defined('DB_CHARSET') and DB_CHARSET!='' )
{