mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-06-02 04:15:05 +02:00
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
This commit is contained in:
@@ -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.'\');
|
||||
|
||||
@@ -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',
|
||||
);
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user