Changeset 4280 for trunk/upgrade.php

Timestamp:

Nov 16, 2009, 8:17:01 PM (14 years ago)

Author:

nikrou

Message:

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.

File:

• trunk/upgrade.php (modified) (5 diffs)

trunk/upgrade.php

@@ -25 +25 @@
 
 // load config file
-$config_file = PHPWG_ROOT_PATH.'include/mysql.inc.php';
+$config_file = PHPWG_ROOT_PATH.'include/config_database.inc.php';
 $config_file_contents = @file_get_contents($config_file);
 if ($config_file_contents === false)
@@ -41 +41 @@
 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');
@@ -51 +51 @@
 
 // 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!='' )
@@ -263 +263 @@
     include($upgrade_file);
 
-    // Something to add in mysql.inc.php?
+    // Something to add in config_database.inc.php?
     if (!empty($mysql_changes))
     {
@@ -274 +274 @@
       {
         array_push($page['infos'],
-          l10n('in include/mysql.inc.php, before ?>, insert:') . '
+          l10n('in include/config_database.inc.php, before ?>, insert:') . '
 <p><textarea rows="4" cols="40">'.implode("\r\n" , $mysql_changes).'</textarea></p>'
           );