From 2bd50459bd15cbf5a1e01ba8b1c6c9b3c41caa0d Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 5 Mar 2007 16:40:27 +0000
Subject: [PATCH] 'tu me sauves la vie', a.k.a. compatibilite ascendante de la
#PAGINATION dans les inclure de inclure de inclure avec {self=#SELF}
---
ecrire/public/balises.php | 5 ++++-
ecrire/public/compiler.php | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ecrire/public/balises.php b/ecrire/public/balises.php
index 3d7cf54e3e..a3a7007a77 100644
--- a/ecrire/public/balises.php
+++ b/ecrire/public/balises.php
@@ -1187,7 +1187,10 @@ function balise_INCLURE_dist($p) {
$_contexte = argumenter_inclure($champ, $p->descr, $p->boucles, $p->id_boucle, false);
if (isset($_contexte['fond'])) {
- if (isset($_contexte['env'])) {
+ // Critere d'inclusion {env} (et {self} pour compatibilite ascendante)
+ if (isset($_contexte['env'])
+ || isset($_contexte['self'])
+ ) {
$flag_env = true;
unset($_contexte['env']);
}
diff --git a/ecrire/public/compiler.php b/ecrire/public/compiler.php
index 2b0db70787..c0d0b39aea 100644
--- a/ecrire/public/compiler.php
+++ b/ecrire/public/compiler.php
@@ -92,7 +92,11 @@ function calculer_inclure($struct, $descr, &$boucles, $id_boucle) {
}
$_contexte = argumenter_inclure($struct, $descr, $boucles, $id_boucle);
- if (isset($_contexte['env'])) {
+
+ // Critere d'inclusion {env} (et {self} pour compatibilite ascendante)
+ if (isset($_contexte['env'])
+ || isset($_contexte['self'])
+ ) {
$flag_env = true;
unset($_contexte['env']);
}
--
GitLab