diff --git a/ecrire/inc/meta.php b/ecrire/inc/meta.php index 12933d69f89354e7f87939b0651aefc6af3a4506..a2b2c54708ca9a4b5542ee0237f0f8df3787721d 100644 --- a/ecrire/inc/meta.php +++ b/ecrire/inc/meta.php @@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return; // http://doc.spip.org/@lire_metas function lire_metas() { - if (!_FILE_CONNECT) return; + if (!_FILE_CONNECT && !@file_exists(_FILE_CONNECT_INS .'.php')) return; if ($result = @spip_query("SELECT nom,valeur FROM spip_meta")) { $GLOBALS['meta'] = array(); @@ -30,7 +30,7 @@ function lire_metas() { function ecrire_meta($nom, $valeur) { if (strlen($nom)){ $GLOBALS['meta'][$nom] = $valeur; - if (!_FILE_CONNECT) return; + if (!_FILE_CONNECT && !@file_exists(_FILE_CONNECT_INS .'.php')) return; spip_query("REPLACE spip_meta (nom, valeur) VALUES ('$nom', " . _q($valeur) . " )"); } } @@ -47,7 +47,7 @@ function effacer_meta($nom) { // // http://doc.spip.org/@ecrire_metas function ecrire_metas() { - if (!_FILE_CONNECT) return; + if (!_FILE_CONNECT && !@file_exists(_FILE_CONNECT_INS .'.php')) return; lire_metas(); diff --git a/ecrire/install/etape_6.php b/ecrire/install/etape_6.php index cd272e1c28b387b2329d189da89e05cf435c5f3c..428dec0abeda99219bc58241e406d19b795eea18 100644 --- a/ecrire/install/etape_6.php +++ b/ecrire/install/etape_6.php @@ -66,6 +66,13 @@ 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(); @@ -75,13 +82,6 @@ function install_etape_6_dist() @unlink($htpasswd."-admin"); ecrire_acces(); - 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'); - } - if (!@rename(_FILE_CHMOD_INS . _FILE_TMP . '.php', _DIR_ETC . 'chmod.php')) { copy(_FILE_CHMOD_INS . _FILE_TMP . '.php',