X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=54329fdeff19c33bff97b7407934e1c23ca1b72f;hp=6a57e201c5442bc4f1409bcfccb25c41d0672470;hb=fc5010729854b1f9c9bc60249460d092ea6694b6;hpb=49f84a522f0ccac3b70728cd41011a0be0eed8cf

diff --git a/inc/database.php b/inc/database.php
index 6a57e201..54329fde 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -4,9 +4,11 @@
  *
  * @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 - 2011 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
@@ -23,27 +25,24 @@
  */
 
 // Initialize database layer
-$databaseInstance = null;
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
+$databaseInstance = NULL;
 
 // Generate FQFN for the database layer
-$fqfn = $cfg->readConfig('base_path') . 'inc/database/lib-' . $cfg->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) -&gt; R.I.P.",
-		$cfg->readConfig('db_type')
+		FrameworkConfiguration::getInstance()->getConfigEntry('db_type')
 	));
 }
 
 // Clean it up
-unset($fqfn, $cfg);
+unset($fqfn);
 
 // Prepare database instance
 $connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $databaseInstance);