aboutsummaryrefslogtreecommitdiffstats
path: root/install/db
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 /install/db
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 'install/db')
-rw-r--r--install/db/65-database.php2
-rw-r--r--install/db/80-database.php6
2 files changed, 4 insertions, 4 deletions
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',
);