From 232d47d157908c6884fef2a58d4fa2ed531fd28e Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 28 Nov 2005 16:28:44 +0000
Subject: [PATCH] eviter des faux messages d'erreur lorsqu'on tente de
recharger un fichier deja lu
---
ecrire/inc_version.php3 | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index 71adf524f4..8bc09c20cd 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -62,19 +62,19 @@ function include_fonction($nom) {
define_once('_DIR_INCLUDE', _DIR_RESTREINT);
$inc = ('inc_' . $nom . '.php');
$f = find_in_path($inc);
- if ($f && (!$GLOBALS['included_files'][$f]++) && is_readable($f))
- include($f);
- else {
+ if ($f && is_readable($f)) {
+ if (!$GLOBALS['included_files'][$f]++) include($f);
+ } else {
$f = _DIR_INCLUDE . $inc;
- if ((!$GLOBALS['included_files'][$f]++) && is_readable($f))
- include($f);
- else {
+ if (is_readable($f)) {
+ if (!$GLOBALS['included_files'][$f]++) include($f);
+ } else {
// provisoire avant renommage php/php3
$f = _DIR_INCLUDE . ('inc_' . $nom . '.php3');
- if ((!$GLOBALS['included_files'][$f]++) && is_readable($f))
- include($f);
- else {
- spip_log($inc . " inconnu");
+ if (is_readable($f)) {
+ if (!$GLOBALS['included_files'][$f]++) include($f);
+ } else {
+ spip_log($f . " inconnu meme en php3");
// esperons qu'elle est dans les fichiers deja lus
}
}
--
GitLab