X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdatabase.php;h=6f454a69cb2624730d87249525f525a1e539db44;hb=8904918d814abf3468d084b8826e4d280b0885e3;hp=da75d1a2340b70b6758cf873ae7fe4b3e33b2856;hpb=84e2207412d3c6ea9f940a83b2cdd4503509808a;p=core.git

diff --git a/inc/database.php b/inc/database.php
index da75d1a2..6f454a69 100644
--- 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, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  * @deprecated
@@ -25,10 +25,10 @@
  */
 
 // Initialize database layer
-$databaseInstance = null;
+$databaseInstance = NULL;
 
 // Generate FQFN for the database layer
-$fqfn = FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getInstance()->getConfigEntry('db_type') . '.php';
+$fqfn = FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type') . '.php';
 
 // Load the database layer include
 if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
@@ -37,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) -&gt; R.I.P.",
-		FrameworkConfiguration::getInstance()->getConfigEntry('db_type')
+		FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
 	));
 }
 
@@ -45,7 +45,7 @@ if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
 unset($fqfn);
 
 // Prepare database instance
-$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $databaseInstance);
+$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getSelfInstance(), $databaseInstance);
 
 // Is the app variable there and valid?
 // @TODO Rewrite this