Compressor instances can now be set/get

[core.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index f2b5632f7512a16e5f46ae1fbe7c10ccc815704a..23dd71928ce0b9c8bb6e52cb34f50625482714e6 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -7,6 +7,8 @@
  * @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
+ * @deprecated
+ * @todo               We should minimize these includes
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +28,7 @@
 $databaseInstance = null;
 
 // Generate FQFN for the database layer
-$fqfn = FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getInstance()->readConfig('db_type') . '.php';
+$fqfn = FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getInstance()->getConfigEntry('db_type') . '.php';
 
 // Load the database layer include
 if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
@@ -35,7 +37,7 @@ if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
 } else {
        // Layer is missing!
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -> R.I.P.",
-               FrameworkConfiguration::getInstance()->readConfig('db_type')
+               FrameworkConfiguration::getInstance()->getConfigEntry('db_type')
        ));
 }