X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=c54d1d9c6880780dbf71d5ab585aba1d120c8a85;hp=6b028d36e7207477859c98cb9ec18d7f3c8a81bd;hb=7629f2314d517561d4301ddfb068a797b6ed8700;hpb=de4993bdd2170972f3c004bf7473bfd2032c2dda

diff --git a/inc/database.php b/inc/database.php
index 6b028d36..c54d1d9c 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -1,10 +1,16 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Connection\Database\DatabaseConnection;
+use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Middleware\Debug\DebugMiddleware;
+
 /**
  * Initializes the database layer
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @deprecated
@@ -28,7 +34,11 @@
 $databaseInstance = NULL;
 
 // Generate FQFN for the database layer
-$fqfn = FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type') . '.php';
+$fqfn = sprintf(
+	'%sinc/database/lib-%s.php',
+	FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path'),
+	FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
+);
 
 // Load the database layer include
 if (BaseFrameworkSystem::isReadableFile($fqfn)) {
@@ -49,7 +59,6 @@ $connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddlewa
 
 // Is the app variable there and valid?
 // @TODO Rewrite this
-if (is_object($app)) $app->setDatabaseInstance($connectionInstance);
-
-// [EOF]
-?>
+if (is_object($app)) {
+	$app->setDatabaseInstance($connectionInstance);
+} // END - if