diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bootstrap.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/bootstrap.php b/lib/bootstrap.php index 9afc16a..177fc08 100644 --- a/lib/bootstrap.php +++ b/lib/bootstrap.php @@ -69,10 +69,6 @@ if (isset($_SERVER['SERVER_NAME'])) { $ABSOLUTE_URI_STUDIP .= $CANONICAL_RELATIVE_PATH_STUDIP; } -// default ASSETS_URL and ASSETS_PATH, customize if required -$GLOBALS['ASSETS_URL'] = $ABSOLUTE_URI_STUDIP . 'assets/'; -$GLOBALS['ASSETS_PATH'] = $ABSOLUTE_PATH_STUDIP . 'assets/'; - // Check if instance is configured; redirect to install script if not if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') { require_once __DIR__ . '/classes/URLHelper.php'; @@ -93,6 +89,14 @@ foreach($added_configs as $key => $value) { $GLOBALS[$key] = $value; } +// create ASSETS_URL and ASSETS_PATH if not customized in config_local.inc.php +if (!isset($GLOBALS['ASSETS_URL'])) { + $GLOBALS['ASSETS_URL'] = $ABSOLUTE_URI_STUDIP . 'assets/'; +} +if (!isset($GLOBALS['ASSETS_PATH'])) { + $GLOBALS['ASSETS_PATH'] = $ABSOLUTE_PATH_STUDIP . 'assets/'; +} + // If no ENV setting was found in the config files, assume ENV=production if (!defined('Studip\ENV')) { define('Studip\ENV', DEFAULT_ENV); |