loadController() is now more generic (TODO: check that all other apps works)

[core.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index 6a57e201c5442bc4f1409bcfccb25c41d0672470..f2b5632f7512a16e5f46ae1fbe7c10ccc815704a 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -25,25 +25,22 @@
 // Initialize database layer
 $databaseInstance = null;
 
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
 // Generate FQFN for the database layer
-$fqfn = $cfg->readConfig('base_path') . 'inc/database/lib-' . $cfg->readConfig('db_type') . '.php';
+$fqfn = FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getInstance()->readConfig('db_type') . '.php';
 
 // Load the database layer include
 if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
        // Load the layer
-       require_once($fqfn);
+       require($fqfn);
 } else {
        // Layer is missing!
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
-               $cfg->readConfig('db_type')
+               FrameworkConfiguration::getInstance()->readConfig('db_type')
        ));
 }
 
 // Clean it up
-unset($fqfn, $cfg);
+unset($fqfn);
 
 // Prepare database instance
 $connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $databaseInstance);