X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fdatabase.php;h=23dd71928ce0b9c8bb6e52cb34f50625482714e6;hb=d2d62b98ebbdb8fa02376c08cec3badb9e48d459;hp=8fb2fd3115fd9c38f86ed4e44a916f055162fc23;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f;p=core.git

diff --git a/inc/database.php b/inc/database.php
index 8fb2fd31..23dd7192 100644
--- 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,16 +28,16 @@
 $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))) {
 	// Load the layer
-	require_once($fqfn);
+	require($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')
 	));
 }