diff --git a/ecrire/inc_install.php b/ecrire/inc_install.php index 1c13688406574e227a63b99151cb662e990ae07e..4cb026ef8588ee6524ad8fdb4e89997374cab30a 100644 --- a/ecrire/inc_install.php +++ b/ecrire/inc_install.php @@ -27,6 +27,7 @@ function install_dist() install_fin_html(); exit; } + @unlink(_FILE_META); $fonc = 'install_' . $etape; if (function_exists($fonc)) $fonc(); @@ -149,8 +150,6 @@ function install_6() include_ecrire ("inc_acces"); ecrire_acces(); - @unlink(_DIR_SESSIONS . 'inc_meta_cache' . _EXTENSION_PHP); - @unlink(_DIR_SESSIONS . 'meta_cache.txt'); if (!@rename(_FILE_CONNECT_INS . _FILE_TMP . _EXTENSION_PHP, _FILE_CONNECT_INS . _EXTENSION_PHP)) { copy(_FILE_CONNECT_INS . _FILE_TMP . _EXTENSION_PHP, diff --git a/ecrire/inc_majbase.php3 b/ecrire/inc_majbase.php3 index 099c49972efad77b63390c900b489bf2679b9f9c..6d5a2783423188ed367fd32e9feb4ab376d9f74d 100644 --- a/ecrire/inc_majbase.php3 +++ b/ecrire/inc_majbase.php3 @@ -1134,6 +1134,7 @@ function maj_base() { spip_query("INSERT INTO spip_index (hash,points,id_objet,id_table) SELECT hash,points,id_syndic as id_objet,'9' as id_table FROM spip_index_syndic"); spip_query("DROP TABLE IF EXISTS spip_index_syndic"); + include_ecrire('inc_meta'); lire_metas(); ecrire_metas(); diff --git a/ecrire/inc_meta.php3 b/ecrire/inc_meta.php3 index 5901b9d1fd94f928ffd5749d4f6c5ec1cd743855..f3962b501bf290113596d15396724ae491463f4e 100644 --- a/ecrire/inc_meta.php3 +++ b/ecrire/inc_meta.php3 @@ -46,11 +46,11 @@ function ecrire_metas() { lire_metas(); if (is_array($meta)) { - $file = _DIR_SESSIONS .'meta_cache.txt'; - $ok = ecrire_fichier ($file, serialize($meta)); + + $ok = ecrire_fichier (_FILE_META, serialize($meta)); if (!$ok && $GLOBALS['connect_statut'] == '0minirezo') echo "<h4 font color=red>", - _T('texte_inc_meta_1', array('fichier' => $file)), + _T('texte_inc_meta_1', array('fichier' => _FILE_META)), " <a href='", generer_url_public('spip_action.php', 'action=test_dirs'), "'>",