diff options
Diffstat (limited to '')
| -rw-r--r-- | install.php | 8 | ||||
| -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 |
4 files changed, 10 insertions, 10 deletions
diff --git a/install.php b/install.php index 2f9832b60..5dd7f9a97 100644 --- a/install.php +++ b/install.php @@ -122,9 +122,9 @@ $admin_mail = (!empty($_POST['admin_mail'])) ? $_POST['admin_mail'] : ''; $infos = array(); $errors = array(); -// database config file migration : mysql.inc.php et config_database.inc.php +// database config file migration : mysql.inc.php et database.inc.php $old_config_file = PHPWG_ROOT_PATH . 'include/mysql.inc.php'; -$config_file = PHPWG_ROOT_PATH . 'include/config_database.inc.php'; +$config_file = PHPWG_ROOT_PATH . 'local/config/database.inc.php'; if (!file_exists($config_file) && file_exists($old_config_file)) { $step = 3; @@ -304,7 +304,7 @@ define(\'DB_COLLATE\', \'\'); { $html_content = htmlentities( $file_content, ENT_QUOTES ); $html_content = nl2br( $html_content ); - $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'); + $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'); $error_copy .= '<br>--------------------------------------------------------------------<br>'; $error_copy .= '<span class="sql_content">' . $html_content . '</span>'; $error_copy .= '<br>--------------------------------------------------------------------<br>'; @@ -391,7 +391,7 @@ if ($step == 3) { $html_content = htmlentities( $file_content, ENT_QUOTES ); $html_content = nl2br( $html_content ); - $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'); + $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'); $error_copy .= '<br>--------------------------------------------------------------------<br>'; $error_copy .= '<span class="sql_content">' . $html_content . '</span>'; $error_copy .= '<br>--------------------------------------------------------------------<br>'; 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 |