From 750d8929fe46df36b2dd294abba1d26d03da17eb Mon Sep 17 00:00:00 2001
From: renato <renato@rezo.net>
Date: Mon, 13 Nov 2006 11:15:09 +0000
Subject: [PATCH] =?UTF-8?q?reinstalling=20SPIP,=20do=20not=20delete=20the?=
=?UTF-8?q?=20previous=20configuration=20(Fran=C3=A7ois=20Schreuer)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/install/etape_6.php | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ecrire/install/etape_6.php b/ecrire/install/etape_6.php
index d43d8ca0c9..f31458edd3 100644
--- a/ecrire/install/etape_6.php
+++ b/ecrire/install/etape_6.php
@@ -36,6 +36,13 @@ function install_etape_6_dist()
else
redirige_par_entete(generer_url_ecrire('install'));
+ if (!@rename(_FILE_CONNECT_INS . _FILE_TMP . '.php',
+ _DIR_ETC . 'connect.php')) {
+ copy(_FILE_CONNECT_INS . _FILE_TMP . '.php',
+ _DIR_ETC . 'connect.php');
+ @unlink(_FILE_CONNECT_INS . _FILE_TMP . '.php');
+ }
+
# maintenant on connait le vrai charset du site s'il est deja configure
# sinon par defaut inc/meta reglera _DEFAULT_CHARSET
# (les donnees arrivent de toute facon postees en _DEFAULT_CHARSET)
@@ -70,13 +77,6 @@ function install_etape_6_dist()
spip_query("REPLACE spip_meta (nom, valeur) VALUES ('email_webmaster', " . _q($email) . ")");
}
- if (!@rename(_FILE_CONNECT_INS . _FILE_TMP . '.php',
- _DIR_ETC . 'connect.php')) {
- copy(_FILE_CONNECT_INS . _FILE_TMP . '.php',
- _DIR_ETC . 'connect.php');
- @unlink(_FILE_CONNECT_INS . _FILE_TMP . '.php');
- }
-
include_spip('inc/config');
init_config();
--
GitLab