added files for database format-upgrade

[core.git] / inc / database.php

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