From 21d0b56ffa3fc8b29ba9a3cd2489d56153949517 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 Dec 2010 08:32:54 +0000
Subject: [PATCH] Report de r16350
---
ecrire/exec/valider_xml.php | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/ecrire/exec/valider_xml.php b/ecrire/exec/valider_xml.php
index ed25068026..07625659ba 100644
--- a/ecrire/exec/valider_xml.php
+++ b/ecrire/exec/valider_xml.php
@@ -155,17 +155,15 @@ function valider_resultats($res, $mode)
}
// http://doc.spip.org/@valider_script
-function valider_script($transformer_xml, $f, $dir, $ext)
+function valider_script($transformer_xml, $script, $dir, $ext)
{
-// ne pas se controler soi-meme ni l'index du repertoire
-
- $script = basename($f, '.php');
- if ($script == _request('exec') OR $script=='index')
- return array('/', 0, '', $script,'');
-
+ $script = basename($script, '.php');
$dir = basename($dir);
$f = charger_fonction($script, $dir, true);
- if(!$f) return false;
+// ne pas se controler soi-meme ni l'index du repertoire ni un fichier annexe
+ if ($script == _request('exec') OR $script=='index' OR !$f)
+ return array('/', 0, '', $script,'');
+
list($texte, $err) = $transformer_xml($f, true);
$appel = '';
--
GitLab