From 20f8fef677a0974cdf1a7d7fd71972e3ab61476e Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sun, 20 Aug 2006 20:52:42 +0000
Subject: [PATCH] =?UTF-8?q?pas=20de=20cache=20pour=20les=20modeles=20(qui?=
=?UTF-8?q?=20sont=20stockes=20dans=20le=20cache=20de=20la=20page=20appela?=
=?UTF-8?q?nte)=20au=20passage,=20mettre=20fond=20dans=20le=20contexte=20d?=
=?UTF-8?q?ans=20recuperer=5Ffond,=20sinon=20le=20calcul=20du=20fichier=20?=
=?UTF-8?q?cache=20est=20erron=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/public/assembler.php | 2 ++
ecrire/public/cacher.php | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php
index 97889707bb..a094f6b976 100644
--- a/ecrire/public/assembler.php
+++ b/ecrire/public/assembler.php
@@ -367,6 +367,8 @@ function recuperer_fond($fond, $contexte=array()) {
define ('_INC_PUBLIC', 1);
if (($fond=='')&&isset($contexte['fond']))
$fond = $contexte['fond'];
+
+ $contexte['fond'] = $fond; // necessaire pour calculer correctement le cache
$page = inclure_page($fond, $contexte);
diff --git a/ecrire/public/cacher.php b/ecrire/public/cacher.php
index ecdb1c1512..5db5212ba7 100644
--- a/ecrire/public/cacher.php
+++ b/ecrire/public/cacher.php
@@ -270,7 +270,9 @@ function public_cacher_dist($contexte, &$use_cache, &$chemin_cache, &$page, &$la
if ($chemin_cache) return creer_cache($page, $chemin_cache, $use_cache);
// cas ignorant le cache car complement dynamique
- if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ if (($_SERVER['REQUEST_METHOD'] == 'POST')
+ OR (isset($contexte['fond']) AND (substr($contexte['fond'],0,7)=='modeles'))
+ ) {
$use_cache = -1;
$lastmodified = 0;
$chemin_cache = "";
--
GitLab