diff --git a/ecrire/bootstrap/config/initial.php b/ecrire/bootstrap/config/initial.php index 7dbc1fb7b004adb5974a8d5941e94eb74941c34f..2d95c29e9f653931623d5777bef46f4c86cd3bcd 100644 --- a/ecrire/bootstrap/config/initial.php +++ b/ecrire/bootstrap/config/initial.php @@ -26,9 +26,9 @@ define('_DIR_RESTREINT', (is_dir(_DIR_RESTREINT_ABS) ? _DIR_RESTREINT_ABS : '')) define('_DIR_RACINE', _DIR_RESTREINT ? '' : '../'); /** chemin absolu vers la racine */ -define('_ROOT_RACINE', dirname(__DIR__, 3) . '/'); +define('_ROOT_RACINE', dirname(__DIR__, 3) . DIRECTORY_SEPARATOR); /** chemin absolu vers le repertoire de travail */ -define('_ROOT_CWD', getcwd() . '/'); +define('_ROOT_CWD', getcwd() . DIRECTORY_SEPARATOR); /** chemin absolu vers ecrire */ define('_ROOT_RESTREINT', _ROOT_CWD . _DIR_RESTREINT); @@ -61,7 +61,7 @@ if (!defined('_NOM_IMG_PACK')) { define('_DIR_IMG_PACK', (_DIR_RACINE . 'prive/' . _NOM_IMG_PACK)); /** le chemin php (absolu) vers les images standard (pour hebergement centralise) */ -define('_ROOT_IMG_PACK', dirname(__DIR__, 3) . '/prive/' . _NOM_IMG_PACK); +define('_ROOT_IMG_PACK', dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'prive' . DIRECTORY_SEPARATOR . _NOM_IMG_PACK); if (!defined('_JAVASCRIPT')) { /** Nom du repertoire des bibliotheques JavaScript */ diff --git a/ecrire/bootstrap/inc/initialization.php b/ecrire/bootstrap/inc/initialization.php index 9d446e33635039427b0c5f8af5d9cbe7fd946396..f70332a689ecc16265b2fe9e1cf4c81e1e6c164f 100644 --- a/ecrire/bootstrap/inc/initialization.php +++ b/ecrire/bootstrap/inc/initialization.php @@ -195,10 +195,10 @@ function spip_initialisation_core($pi = null, $pa = null, $ti = null, $ta = null define('_DEFAULT_CHARSET', 'utf-8'); } if (!defined('_ROOT_PLUGINS')) { - define('_ROOT_PLUGINS', _ROOT_RACINE . 'plugins/'); + define('_ROOT_PLUGINS', _ROOT_RACINE . 'plugins' . DIRECTORY_SEPARATOR); } if (!defined('_ROOT_PLUGINS_DIST')) { - define('_ROOT_PLUGINS_DIST', _ROOT_RACINE . 'plugins-dist/'); + define('_ROOT_PLUGINS_DIST', _ROOT_RACINE . 'plugins-dist' . DIRECTORY_SEPARATOR); } if (!defined('_ROOT_PLUGINS_SUPPL') && defined('_DIR_PLUGINS_SUPPL') && _DIR_PLUGINS_SUPPL) { define('_ROOT_PLUGINS_SUPPL', _ROOT_RACINE . str_replace(_DIR_RACINE, '', _DIR_PLUGINS_SUPPL));