Rewritten:

[core.git] / framework / config-global.php

diff --git a/framework/config-global.php b/framework/config-global.php
index 68af380e17908d69ace120acd30975ad5cc14673..bf734267fea51f73d3ec970745bff6c3d55747dd 100644 (file)
--- a/framework/config-global.php
+++ b/framework/config-global.php
@@ -39,7 +39,7 @@ $cfg->setConfigEntry('root_base_path', ApplicationEntryPoint::getRootPath() . DI
 $cfg->setConfigEntry('framework_base_path', ApplicationEntryPoint::detectFrameworkPath());
 
 // CFG: BASE-URL
-$cfg->setConfigEntry('base_url', $cfg->detectBaseUrl());
+$cfg->setConfigEntry('base_url', FrameworkBootstrap::detectBaseUrl());
 
 // CFG: DATABASE-TYPE
 $cfg->setConfigEntry('database_type', 'local_file_database');
@@ -47,8 +47,8 @@ $cfg->setConfigEntry('database_type', 'local_file_database');
 // CFG: LOCAL-DATABASE-PATH
 $cfg->setConfigEntry('local_database_path', $cfg->getConfigEntry('root_base_path') . 'db/');
 
-// CFG: TIME-ZONE
-$cfg->setDefaultTimezone('Europe/Berlin');
+// Default timezone
+FrameworkBootstrap::setDefaultTimezone('Europe/Berlin');
 
 // CFG: CLASS-PREFIX
 $cfg->setConfigEntry('class_prefix', 'class_');
@@ -294,13 +294,13 @@ $cfg->setConfigEntry('guest_class', 'CoreFramework\User\Guest\Guest');
 $cfg->setConfigEntry('cookie_expire', (60*60*2)); // Two hours!
 
 // CFG: COOKIE-PATH
-$cfg->setConfigEntry('cookie_path', $cfg->detectScriptPath() . DIRECTORY_SEPARATOR);
+$cfg->setConfigEntry('cookie_path', FrameworkBootstrap::detectScriptPath() . DIRECTORY_SEPARATOR);
 
 // CFG: COOKIE-DOMAIN
-$cfg->setConfigEntry('cookie_domain', $cfg->detectDomain()); // Is mostly the same...
+$cfg->setConfigEntry('cookie_domain', FrameworkBootstrap::detectDomain()); // Is mostly the same...
 
 // CFG: COOKIE-SSL
-$cfg->setConfigEntry('cookie_ssl', $cfg->isHttpSecured());
+$cfg->setConfigEntry('cookie_ssl', FrameworkBootstrap::isHttpSecured());
 
 // CFG: CRYPT-FIXED-SALT
 $cfg->setConfigEntry('crypt_fixed_salt', 'N');
@@ -458,5 +458,8 @@ $cfg->setConfigEntry('extension_uuid_loaded', false);
 // CFG: REGISTRY-ITERATOR-CLASS
 $cfg->setConfigEntry('registry_iterator_class', 'CoreFramework\Iterator\Registry\RegistryIterator');
 
+// CFG: QUIET-DNS-RESOLVER
+$cfg->setConfigEntry('quiet_dns_resolver', FALSE);
+
 // Remove config from this name-space. Don't worry, no configuration is cleared.
 unset($cfg);