From ba90a31b446343be792cd58eaec9132a57170e7e Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 11 Apr 2008 13:56:48 +0000
Subject: [PATCH] lever le flag session danc evaluer_fond directement
---
ecrire/inc/utils.php | 5 +++++
ecrire/public/assembler.php | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index ead7bb24b9..4407bac725 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -1352,6 +1352,11 @@ function evaluer_fond ($fond, $contexte=array(), $options=array(), $connect=null
$fond = $contexte['fond'];
$page = inclure_page($fond, $contexte, $connect);
+ // Lever un drapeau (global) si le fond utilise #SESSION
+ // a destination de public/parametrer
+ if (isset($page['invalideurs'])
+ AND isset($page['invalideurs']['session']))
+ $GLOBALS['cache_utilise_session'] = $page['invalideurs']['session'];
if ($GLOBALS['flag_ob'] AND ($page['process_ins'] != 'html')) {
ob_start();
xml_hack($page, true);
diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php
index e0aa10e1d2..fc9bc229aa 100644
--- a/ecrire/public/assembler.php
+++ b/ecrire/public/assembler.php
@@ -622,11 +622,6 @@ function recuperer_fond($fond, $contexte=array(), $trim=true, $connect='') {
foreach(is_array($fond) ? $fond : array($fond) as $f){
$page = evaluer_fond($f, $contexte, $options, $connect);
$texte .= $trim ? rtrim($page['texte']) : $page['texte'];
- // Lever un drapeau (global) si le modele utilise #SESSION
- // a destination de public/parametrer
- if (isset($page['invalideurs'])
- AND isset($page['invalideurs']['session']))
- $GLOBALS['cache_utilise_session'] = $page['invalideurs']['session'];
}
return $trim ? ltrim($texte) : $texte;
--
GitLab