From ada5c844c7f610d0539934007c38e34c1ecf5bca Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 30 Aug 2009 13:14:35 +0000
Subject: [PATCH] Suppresssion dans recuperer_fond d'une option qui ne servait
rien (model).
---
ecrire/inc/utils.php | 3 ---
ecrire/public/balises.php | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 481e4313ff..f7e42f98da 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -1637,9 +1637,6 @@ function recuperer_fond($fond, $contexte=array(), $options = array(), $connect='
unset($contexte['connect']);
}
- if (isset($options['modele']))
- $contexte = creer_contexte_de_modele($contexte);
-
$texte = "";
$pages = array();
$lang_select = '';
diff --git a/ecrire/public/balises.php b/ecrire/public/balises.php
index 92b28bae2f..ae975e3fc5 100644
--- a/ecrire/public/balises.php
+++ b/ecrire/public/balises.php
@@ -998,9 +998,9 @@ function balise_MODELE_dist($p) {
if (isset($p->boucles[$p->id_boucle]))
$connect = $p->boucles[$p->id_boucle]->sql_serveur;
- $_options = "'trim'=>true, 'modele'=>true"
- . (isset($_contexte['ajax'])?", 'ajax'=>true":'')
- . ", 'compil'=>array(" . memoriser_contexte_compil($p) .")";
+ $_options = memoriser_contexte_compil($p);
+ $_options = "'compil'=>array($_options), 'trim'=>true"
+ . (isset($_contexte['ajax'])?", 'ajax'=>true":'');
$page = sprintf(CODE_RECUPERER_FOND, "'modeles/' . $nom", 'array(' . join(',', $_contexte) .')', $_options, _q($connect));
--
GitLab