4 files changed, 11 insertions, 11 deletions
diff --git a/install.php b/install.php
index 2e82a9709..135c7fb47 100644
--- a/install.php
+++ b/install.php
@@ -168,7 +168,7 @@ $infos = array();
 $errors = array();
 
 // Open config.php ... if it exists
-$config_file = PHPWG_ROOT_PATH.'include/mysql.inc.php';
+$config_file = PHPWG_ROOT_PATH.'include/config_database.inc.php';
 if (@file_exists($config_file))
 {
   include($config_file);
@@ -291,10 +291,10 @@ if ( isset( $_POST['install'] ))
   {
     $step = 2;
     $file_content = '<?php
-$cfgBase = \''.$dbname.'\';
-$cfgUser = \''.$dbuser.'\';
-$cfgPassword = \''.$dbpasswd.'\';
-$cfgHote = \''.$dbhost.'\';
+$conf[\'db_base\'] = \''.$dbname.'\';
+$conf[\'db_user\'] = \''.$dbuser.'\';
+$conf[\'db_password\'] = \''.$dbpasswd.'\';
+$conf[\'db_host\'] = \''.$dbhost.'\';
 
 $prefixeTable = \''.$table_prefix.'\';
 
diff --git a/install/db/65-database.php b/install/db/65-database.php
index b6a5a0a74..2d445ea3f 100644
--- a/install/db/65-database.php
+++ b/install/db/65-database.php
@@ -255,7 +255,7 @@ ALTER TABLE t1 CHANGE c1 c1 TEXT CHARACTER SET utf8;
 
 
 // +-----------------------------------------------------------------------+
-// changes to write in mysql.inc.php
+// changes to write in config_database.inc.php
   array_push($mysql_changes,
 'define(\'PWG_CHARSET\', \''.$pwg_charset.'\');
 define(\'DB_CHARSET\',  \''.$db_charset.'\');
diff --git a/install/db/80-database.php b/install/db/80-database.php
index fd403d8d7..dbc7c5b57 100644
--- a/install/db/80-database.php
+++ b/install/db/80-database.php
@@ -173,7 +173,7 @@ $list_files = array(
 'include_phpwebgallery',
 'include_phpwebgallery/config.php',
 'include_phpwebgallery/index.htm',
-'include_phpwebgallery/mysql.inc.php',
+'include_phpwebgallery/config_database.inc.php',
 'index.htm',
 // Comparison between phpwebgallery-1.2.1 and phpwebgallery-1.1.0
 'admin/isadmin.php',
@@ -927,7 +927,7 @@ $list_files = array(
 // Comparison between trunk-r3105 and phpwebgallery-2.0.0RC4
 'admin/template/goto/theme/roma/images/bottom-left-bg.png',
 'admin/template/goto/theme/roma/images/top-left-bg.png',
-'include/mysql.inc.php',
+'include/config_database.inc.php',
 'template-common/lib/ui/ui.accordion.packed.js',
 'template-common/lib/ui/ui.core.packed.js',
 'template-common/lib/ui/ui.datepicker.css',
@@ -943,7 +943,7 @@ $list_files = array(
 );
 
 $list_exlude_files = array(
-'include/mysql.inc.php',
+'include/config_database.inc.php',
 );
 
 
diff --git a/install/upgrade_1.3.1.php b/install/upgrade_1.3.1.php
index 69257dc5c..40657c7f7 100644
--- a/install/upgrade_1.3.1.php
+++ b/install/upgrade_1.3.1.php
@@ -579,7 +579,7 @@ UPDATE '.CATEGORIES_TABLE.'
 }
 
 // load the 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)
 {
@@ -595,7 +595,7 @@ if (!is_writable($config_file))
   die('FILE NOT WRITABLE '.$config_file);
 }
 
-// changes to write in mysql.inc.php
+// changes to write in config_database.inc.php
 array_push($mysql_changes, 'define(\'PHPWG_INSTALLED\', true);');
 
 // Send infos