diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php index 204b83ab9ded86a3ad4b7fc488f771094c8d2ad7..b3de6241107491953910878689d982fa0c3a4272 100644 --- a/ecrire/inc_utils.php +++ b/ecrire/inc_utils.php @@ -51,15 +51,16 @@ function include_ecrire($file, $silence=false) { define('_DIR_INCLUDE', _DIR_RESTREINT); preg_match('/^((inc_)?([^.]*))(\.php[3]?)?$/', $file, $r); - # fichiers old-style, ecrire/inc_truc.php - if (file_exists($f = _DIR_INCLUDE . $r[1] . '.php')) - return include_local($f, $silence); - # cas special inc/index => indexation if ($r[3] == 'index') return include_spip('inc/indexation'); # new style, surchargeable - return include_spip('inc/'.$r[3]); + if ($f=include_spip('inc/'.$r[3])) + return $f; + + # fichiers old-style, ecrire/inc_truc.php + if (file_exists($f = _DIR_INCLUDE . $r[1] . '.php')) + return include_local($f, $silence); }