From 0cf15c637f32a365e434892f741aa7357c2917a6 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 9 Dec 2010 09:05:10 +0000
Subject: [PATCH] report oublie de r15943
---
ecrire/inc/utils.php | 10 ++++++----
ecrire/public/assembler.php | 3 +++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 5321540ab4..49f0ec205c 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -1809,11 +1809,13 @@ function recuperer_fond($fond, $contexte=array(), $options = array(), $connect='
foreach(is_array($fond) ? $fond : array($fond) as $f){
$page = evaluer_fond($f, $contexte, $connect);
if ($page === '') {
- $msg = array('info_erreur_squelette2',
- array('fichier'=>"'$fond'"));
- erreur_squelette($msg, @$options['compil']);
+ $c = isset($options['compil']) ? $options['compil'] :'';
+ $a = array('fichier'=>$fond.'.'._EXTENSION_SQUELETTES);
+ erreur_squelette(_T('info_erreur_squelette2', $a), $c);
}
- if (isset($options['ajax'])AND $options['ajax'])
+
+ if (isset($options['ajax'])AND $options['ajax']){
+ include_spip('inc/filtres');
$page['texte'] = encoder_contexte_ajax(array_merge($contexte,array('fond'=>$f)),'',$page['texte']);
$page = pipeline('recuperer_fond',array(
diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php
index cbfa2bb012..82ddd75e47 100644
--- a/ecrire/public/assembler.php
+++ b/ecrire/public/assembler.php
@@ -94,6 +94,9 @@ function assembler($fond, $connect='') {
// produire la page : peut mettre a jour $lastmodified
$produire_page = charger_fonction('produire_page','public');
$page = $produire_page($fond, $contexte, $use_cache, $chemin_cache, NULL, $page, $lastmodified, $connect);
+ if ($page === '')
+ erreur_squelette(_T('info_erreur_squelette2',
+ array('fichier'=>$fond.'.'._EXTENSION_SQUELETTES)));
}
if ($page AND $chemin_cache) $page['cache'] = $chemin_cache;
--
GitLab