diff --git a/ecrire/base/connect_sql.php b/ecrire/base/connect_sql.php index 9020e89ea0d702a21d405574712c8c16768b5255..d2915943150a8e78c47230a36ca5f9fa19c29edd 100644 --- a/ecrire/base/connect_sql.php +++ b/ecrire/base/connect_sql.php @@ -16,7 +16,7 @@ * @package SPIP\Core\SQL **/ if (!defined('_ECRIRE_INC_VERSION')) return; -include_spip('base/objets'); +require_once _ROOT_RESTREINT . 'base/objets.php'; diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index f36a2fd615e9eece7604739d17de3c039622e907..d8f342b8fef1a2b554492d6f8cb14e5e5f8dd37f 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -1255,8 +1255,11 @@ function find_in_path ($file, $dirname='', $include=false) { include_once _ROOT_CWD . $a; $inc[$dirname][$file] = $inc[''][$dirname . $file] = true; } - if (!defined('_SAUVER_CHEMIN')) - define('_SAUVER_CHEMIN',true); + if (!defined('_SAUVER_CHEMIN')){ + // si le chemin n'a pas encore ete charge, ne pas lever le flag, ne pas cacher + if (is_null($GLOBALS['path_files'])) return $a; + define('_SAUVER_CHEMIN', true); + } return $GLOBALS['path_files'][$GLOBALS['path_sig']][$dirname][$file] = $GLOBALS['path_files'][$GLOBALS['path_sig']][''][$dirname . $file] = $a; } }