Solving conflicts for PMC-1126

This commit is contained in:
Andrea Adamczyk
2019-08-29 12:09:04 -04:00
committed by Julio Cesar Laura Avendaño
parent c95280fe2a
commit 8b5ef84fa7
4 changed files with 118 additions and 5 deletions

View File

@@ -37,6 +37,15 @@ define('PATH_RBAC', PATH_RBAC_HOME . 'engine/classes/');
define("PATH_CUSTOM_SKINS", PATH_DATA . "skins/");
define("PATH_TPL", PATH_CORE . "templates/");
define('PATH_C', PATH_DATA . 'compiled/');
define('DB_HOST', env('DB_HOST'));
define('DB_NAME', env('DB_DATABASE'));
define('DB_USER', env('DB_USERNAME'));
define('DB_PASS', env('DB_PASSWORD'));
define('PATH_HOME', PATH_TRUNK . '/workflow/');
define('PATH_HTML', PATH_HOME . 'public_html/');
define('PATH_SMARTY_C', PATH_TRUNK . '/shared/compiled/smarty/c');
define('PATH_SMARTY_CACHE', PATH_TRUNK . '/shared/compiled/smarty/cache');
define('PATH_THIRDPARTY', PATH_TRUNK . '/thirdparty/');
// Set Time Zone
$_SESSION['__SYSTEM_UTC_TIME_ZONE__'] = (int)(env('MAIN_SYSTEM_UTC_TIME_ZONE', 'workflow')) == 1;