From f8d88ccb780cd60e5a057ac386b56d6d3eefa53b Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Wed, 30 May 2007 20:04:02 +0000
Subject: [PATCH] definition de l'espace prive par position d'un
define(_ESPACE_PRIVE)
---
ecrire/inc/utils.php | 9 +--------
ecrire/index.php | 1 +
ecrire/public.php | 1 +
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 9606c812a5..37a5f042e5 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -478,14 +478,7 @@ function self($amp = '&', $root = false) {
// Indique si on est dans l'espace prive
// http://doc.spip.org/@test_espace_prive
function test_espace_prive() {
- static $prive;
- if (!isset($prive))
- $prive = (
- (_DIR_RESTREINT=='')
- OR (_request('action') !== null)
- OR (_request('exec') !== null)
- );
- return $prive;
+ return defined('_ESPACE_PRIVE') ? _ESPACE_PRIVE : false;
}
//
diff --git a/ecrire/index.php b/ecrire/index.php
index a6c9870914..07010f7839 100644
--- a/ecrire/index.php
+++ b/ecrire/index.php
@@ -12,6 +12,7 @@
if (!defined('_ECRIRE_INC_VERSION')) include 'inc_version.php';
+define('_ESPACE_PRIVE', true);
// Verification anti magic_quotes_sybase, pour qui addslashes("'") = "''"
// On prefere la faire ici plutot que dans inc_version, c'est moins souvent et
diff --git a/ecrire/public.php b/ecrire/public.php
index c35a3116f5..0c04b1c59a 100644
--- a/ecrire/public.php
+++ b/ecrire/public.php
@@ -56,6 +56,7 @@ if (defined('_INC_PUBLIC')) {
include_spip('inc/headers');
$var_f = charger_fonction($action, 'action');
$var_f();
+ define('_ESPACE_PRIVE', true);
if ($GLOBALS['redirect']
OR $GLOBALS['redirect'] = _request('redirect'))
redirige_par_entete(urldecode($GLOBALS['redirect']));
--
GitLab