Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv25046
Modified Files:
inc-calcul.php3 inc-public.php3
Log Message:
mes_options et inc_debug pas toujours chargés
Index: inc-calcul.php3
RCS file: /home/spip-cvs/spip/inc-calcul.php3,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- inc-calcul.php3 24 Oct 2004 20:07:37 -0000 1.121
+++ inc-calcul.php3 30 Oct 2004 12:24:00 -0000 1.122
@@ -96,9 +96,11 @@
erreur_squelette($skel_code[0], $skel_code[1]);
else {
if ($GLOBALS['var_debug']
- AND $GLOBALS['debug_objet'] == $nom
- AND $GLOBALS['debug_affiche'] == 'code')
+ AND $GLOBALS['debug_objet'] == $nom
+ AND $GLOBALS['debug_affiche'] == 'code') {
+ include_ecrire("inc_debug_sql.php3");
debug_dumpfile ($skel_code);
+ }
eval('?'.'>'.$skel_code);
if (function_exists($nom)) {
ecrire_fichier ($phpfile, $skel_code);
@@ -135,7 +137,6 @@
$lang ? $lang : lire_meta('langue_site')))
list($id_rubrique_fond, $lang) = $r;
-
if (!$GLOBALS['forcer_lang'])
lang_select($lang);
@@ -155,9 +156,11 @@
// Passer la main au debuggueur)
if ($GLOBALS['var_debug']
- AND $GLOBALS['debug_objet'] == $fonc
- AND $GLOBALS['debug_affiche'] == 'resultat')
+ AND $GLOBALS['debug_objet'] == $fonc
+ AND $GLOBALS['debug_affiche'] == 'resultat') {
+ include_ecrire("inc_debug_sql.php3");
debug_dumpfile ($page['texte']);
+ }
}
// Nettoyer le resultat si on est fou de XML
Index: inc-public.php3
RCS file: /home/spip-cvs/spip/inc-public.php3,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- inc-public.php3 29 Oct 2004 16:57:45 -0000 1.105
+++ inc-public.php3 30 Oct 2004 12:24:00 -0000 1.106
@@ -140,6 +140,7 @@
// Passer la main au debuggueur le cas echeant
if ($var_debug) {
+ include_ecrire("inc_debug_sql.php3");
debug_dumpfile('');
exit;
} else if (count($tableau_des_erreurs) > 0