aboutsummaryrefslogtreecommitdiffstats
path: root/install.php
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2010-03-21 12:32:49 +0000
committernikrou <nikrou@piwigo.org>2010-03-21 12:32:49 +0000
commit85c1c1b1ea1cdbb6c6903e0cec11d86a79f750ad (patch)
tree7fa762080a234a4fd1527f4c3d36ce87c3f3be4b /install.php
parent76b2701e1654e4539136822fda834a7b8262083b (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 '')
-rw-r--r--install.php8
1 files changed, 4 insertions, 4 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>';