From b208d68e832e383f76f8a93dbafd0abb4e7f6654 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Wed, 1 Mar 2006 10:13:34 +0000
Subject: [PATCH] =?UTF-8?q?prendre=20inc/truc.php=20en=20priorit=C3=A9=20s?=
=?UTF-8?q?ur=20ecrire/inc=5Ftruc.php=20(permet=20les=20mises=20=C3=A0=20j?=
=?UTF-8?q?our=20par=20ftp=20qui=20ne=20nettoient=20pas=20les=20anciens=20?=
=?UTF-8?q?fichiers)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_utils.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php
index 204b83ab9d..b3de624110 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);
}
--
GitLab