diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 54c79401f1d51ad48aea5e17b6c74d918b18b744..62b361a035643e8e9c0e87629eaabb969af30070 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 7d9f5cbf48304d6edf54dc02c8173e06f4c4a3fd..b0183845838116b881cf461fbee8ae261d6b5fa9 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 d29e287c7e03196165ff1ab26326c59850cb5f1a..25eead45d854eef3f2e2397028501d01b1c56d75 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; }