From 71ccd45c87838f49fb06014d71bbc926f802d88d Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 15 Jun 2009 06:59:41 +0000
Subject: [PATCH] =?UTF-8?q?Complement=20=C3=A0=20[14107],=20mais=20celui-c?=
=?UTF-8?q?i=20fiche=20en=20l'air=20le=20calcul=20de=20la=20signature=20aj?=
=?UTF-8?q?ax,=20en=20particulier=20le=20formulaire=20de=20login.=20La=20v?=
=?UTF-8?q?ersion=20de=20d=C3=A9veloppement=20est=20donc=20fausse=20depuis?=
=?UTF-8?q?=20[14107]=20mais=20j'aimerais=20comprendre=20pourquoi.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/utils.php | 2 +-
ecrire/index.php | 2 +-
prive/style_prive_plugins_fonctions.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 54c79401f1..62b361a035 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -1724,7 +1724,7 @@ function recuperer_fond($fond, $contexte=array(), $options = array(), $connect='
function trouve_modele($nom)
{
- return find_in_path($nom.'.'. _EXTENSION_SQUELETTES, 'modeles');
+ return find_in_path( 'modeles/' . $nom.'.'. _EXTENSION_SQUELETTES);
}
// Charger dynamiquement une extension php
diff --git a/ecrire/index.php b/ecrire/index.php
index 7d9f5cbf48..b018384583 100644
--- a/ecrire/index.php
+++ b/ecrire/index.php
@@ -137,7 +137,7 @@ if ($var_f = _request('transformer_xml')) {
set_request('var_url', $exec);
$exec = $var_f;
}
-elseif (find_in_path("prive/exec/$exec.html")) {
+elseif (find_in_path("prive/exec/$exec", _EXTENSION_SQUELETTES)) {
$exec = "fond";
}
diff --git a/prive/style_prive_plugins_fonctions.php b/prive/style_prive_plugins_fonctions.php
index d29e287c7e..25eead45d8 100644
--- a/prive/style_prive_plugins_fonctions.php
+++ b/prive/style_prive_plugins_fonctions.php
@@ -3,7 +3,7 @@
function tous_les_fonds($dir,$pattern){
$liste = find_all_in_path($dir,$pattern);
foreach($liste as $k=>$v)
- $liste[$k] = $dir . basename($v,'.html');
+ $liste[$k] = $dir . basename($v,'.' . _EXTENSION_SQUELETTES);
return $liste;
}
--
GitLab