CR observations

This commit is contained in:
Paula Quispe
2017-02-13 11:19:58 -04:00
parent db4c0a67b6
commit b672183845
2 changed files with 6 additions and 11 deletions

View File

@@ -3011,11 +3011,12 @@ class Bootstrap
if (!defined('SYS_SYS')) {
define('SYS_SYS', $wsName);
}
if (!defined('PATH_DATA_SITE')) {
define('PATH_DATA_SITE', PATH_DATA . 'sites' . PATH_SEP . $wsName . PATH_SEP);
if (defined('SYS_SYS') && !defined('PATH_DATA_SITE')) {
define('PATH_DATA_SITE', PATH_DATA . 'sites' . PATH_SEP . SYS_SYS . PATH_SEP);
}
if (!defined('PATH_WORKSPACE')) {
if (defined('PATH_DATA_SITE') && !defined('PATH_WORKSPACE')) {
define('PATH_WORKSPACE', PATH_DATA_SITE);
set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE);
}
}

View File

@@ -52,14 +52,8 @@ function __autoload ($sClassName)
}
}
if (defined( 'SYS_SYS' )) {
Bootstrap::setConstantsRelatedWs('SYS_SYS');
}
if (!defined('PATH_WORKSPACE')) {
define('PATH_WORKSPACE', PATH_DATA_SITE);
set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE);
if (defined('SYS_SYS')) {
Bootstrap::setConstantsRelatedWs(SYS_SYS);
}
//Start - Custom functions