adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-11 19:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Feature 928 resolved.

Browse Source 
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
This commit is contained in:
nikrou
2009-11-16 19:17:01 +00:00
parent 9a773f003c
commit 8a29965450
25 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
upgrade_feed.php
+3 -3
View File
@@ -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!='' )
{