diff --git a/ecrire/install/etape_6.php b/ecrire/install/etape_6.php index d43d8ca0c9cb0fd0e118d1f4baa65393aa50ae7f..f31458edd386fe12a3063011335ad2129029a243 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();