From b4cabff142dc5e9967317661d0b540a8ce6b9a97 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Wed, 18 Jan 2006 22:55:18 +0000
Subject: [PATCH] detruire le cache des meta des le debut de l'install, sinon
ca aiguille sur l'adresse de la version reinstallee qui n'est pas
necessairement la meme. Et ne pas oublier de charger inc_meta quand il y a
aussi une MAJ de la base
---
ecrire/inc_install.php | 3 +--
ecrire/inc_majbase.php3 | 1 +
ecrire/inc_meta.php3 | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ecrire/inc_install.php b/ecrire/inc_install.php
index 1c13688406..4cb026ef85 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 099c49972e..6d5a278342 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 5901b9d1fd..f3962b501b 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'),
"'>",
--
GitLab