diff options
| author | nikrou <nikrou@piwigo.org> | 2010-03-21 12:32:49 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2010-03-21 12:32:49 +0000 |
| commit | 85c1c1b1ea1cdbb6c6903e0cec11d86a79f750ad (patch) | |
| tree | 7fa762080a234a4fd1527f4c3d36ce87c3f3be4b /install | |
| parent | 76b2701e1654e4539136822fda834a7b8262083b (diff) | |
Feature 1522 : move database config file to local directory
(include/config_database.inc.php becomes local/config/database.inc.php)
git-svn-id: http://piwigo.org/svn/trunk@5213 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'install')
| -rw-r--r-- | install/db/65-database.php | 2 | ||||
| -rw-r--r-- | install/db/80-database.php | 6 | ||||
| -rw-r--r-- | install/upgrade_1.3.1.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/install/db/65-database.php b/install/db/65-database.php index 8558024f4..9f732b86f 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 config_database.inc.php +// changes to write in 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 8842e5962..06767dae9 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/config_database.inc.php', +'include_phpwebgallery/local/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/config_database.inc.php', +'local/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/config_database.inc.php', +'local/config/database.inc.php', ); diff --git a/install/upgrade_1.3.1.php b/install/upgrade_1.3.1.php index ecc2c875d..eab8bd57f 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/config_database.inc.php'; +$config_file = PHPWG_ROOT_PATH.'local/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 config_database.inc.php +// changes to write in database.inc.php array_push($mysql_changes, 'define(\'PHPWG_INSTALLED\', true);'); // Send infos |