Continued with rewrites:

[core.git] / framework / database.php

diff --git a/framework/database.php b/framework/database.php
index 6249535f47918677b53f3c5d4faf0b9567a2807c..2a13ed54263d5085c94bbfde1e67c932b4c84121 100644 (file)
--- a/framework/database.php
+++ b/framework/database.php
@@ -2,6 +2,7 @@
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Connection\Database\DatabaseConnection;
+use CoreFramework\EntryPoint\ApplicationEntryPoint;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Middleware\Debug\DebugMiddleware;
 
@@ -35,9 +36,9 @@ $databaseInstance = NULL;
 
 // Generate FQFN for the database layer
 $fqfn = sprintf(
-       '%sframework/database/lib-%s.php',
-       FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path'),
-       FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
+       '%sdatabase/lib-%s.php',
+       FrameworkConfiguration::getSelfInstance()->getConfigEntry('framework_base_path'),
+       FrameworkConfiguration::getSelfInstance()->getConfigEntry('database_type')
 );
 
 // Load the database layer include
@@ -47,7 +48,7 @@ if (BaseFrameworkSystem::isReadableFile($fqfn)) {
 } else {
        // Layer is missing!
        ApplicationEntryPoint::app_exit(sprintf('[Main:] Database layer is missing! (%s) -> R.I.P.',
-               FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
+               FrameworkConfiguration::getSelfInstance()->getConfigEntry('database_type')
        ));
 }