Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv23979
Modified Files:
inc-calcul.php3 inc-public-global.php3
Log Message:
débogage surligne + carfte d'indentité des caches inclus
Index: inc-public-global.php3
RCS file: /home/spip-cvs/spip/inc-public-global.php3,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- inc-public-global.php3 20 Aug 2004 08:58:51 -0000 1.122
+++ inc-public-global.php3 20 Aug 2004 10:12:53 -0000 1.123
@@ -21,8 +21,7 @@
spip_timer();
$page = calculer_page($chemin_cache,
array('fond' => $fond,
- 'contexte' => $contexte,
- 'var_recherche' => $HTTP_GET_VARS['var_recherche']),
+ 'contexte' => $contexte),
$delais,
$inclusion);
if ($chemin_cache)
@@ -127,6 +126,12 @@
$page['texte'] = $page_boutons_admin;
$page['process_ins'] = 'php';
}
+
+ // Surligne
+ if ($GLOBALS['var_recherche']) {
+ include_ecrire("inc_surligne.php3");
+ $page['texte'] = surligner_mots($page['texte'], $GLOBALS['var_recherche']);
+ }
}
if ($chemin_cache) $page['cache'] = $chemin_cache;
Index: inc-calcul.php3
RCS file: /home/spip-cvs/spip/inc-calcul.php3,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- inc-calcul.php3 19 Aug 2004 20:45:15 -0000 1.88
+++ inc-calcul.php3 20 Aug 2004 10:12:52 -0000 1.89
@@ -196,7 +196,7 @@
return $contexte;
}
-function calculer_page_globale($cache, $contexte_local, $fond, $var_recherche) {
+function calculer_page_globale($cache, $contexte_local, $fond) {
global $spip_lang;
// Gestion des URLs personnalises - sale mais historique
@@ -229,12 +229,6 @@
// Go to work !
$page = cherche_page($cache, $contexte_local, $fond, $id_rubrique_fond, $spip_lang);
- // Surligne
- if ($var_recherche) {
- include_ecrire("inc_surligne.php3");
- $page['texte'] = surligner_mots($page['texte'], $var_recherche);
- }
-
$signal = array();
foreach(array('id_parent', 'id_rubrique', 'id_article', 'id_auteur',
'id_breve', 'id_forum', 'id_secteur', 'id_syndic', 'id_syndic_article',
@@ -242,14 +236,11 @@
if ($contexte_local[$val])
$signal['contexte'][$val] = intval($contexte_local[$val]);
}
- $signal['process_ins'] = $page['process_ins'];
# ne marchera qu'avec les inclusions 'html' (versus 'php')
# $signal['fraicheur'] = $page['fraicheur'];
- $signal = "<!-- ".str_replace("\n", " ", serialize($signal))." -->\n";
-
- $page['texte'] = $signal.$page['texte'];
+ $page['signal'] = $signal;
return $page;
}
@@ -264,7 +255,7 @@
$contexte_inclus = $elements['contexte'];
$page = cherche_page($chemin_cache,
$contexte_inclus,
- $elements['fond'],
+ $elements['fond'],
$contexte_inclus['id_rubrique']
);
}
@@ -291,13 +282,16 @@
}
$page = calculer_page_globale($chemin_cache,
$elements['contexte'],
- $elements['fond'],
- $elements['var_recherche']);
+ $elements['fond']);
}
+ $page['signal']['process_ins'] = $page['process_ins'];
+ $signal = "<!-- ".str_replace("\n", " ",
+ serialize($page['signal']))." -->\n";
+
// Enregistrer le fichier cache
if ($delais>0)
- ecrire_fichier($chemin_cache, $page['texte']);
+ ecrire_fichier($chemin_cache, $signal.$page['texte']);
return $page;
}