X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=28ad6743294a12264742e7477afce852a5e82453;hp=7402d6f1e8f7c05df6abdb819c323bd83d420906;hb=39c1aaf705e8e3c274d56ef1fa931a086f729c48;hpb=1ee35e6d96c456b8e3499bd683f1647aa28bd501 diff --git a/inc/database.php b/inc/database.php index 7402d6f1..28ad6743 100644 --- a/inc/database.php +++ b/inc/database.php @@ -4,7 +4,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 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 @@ -31,12 +31,12 @@ $databaseInstance = NULL; $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))) { +if (BaseFrameworkSystem::isReadableFile($fqfn)) { // Load the layer require($fqfn); } else { // Layer is missing! - ApplicationEntryPoint::app_exit(sprintf("[Main:] Database layer is missing! (%s) -> R.I.P.", + ApplicationEntryPoint::app_exit(sprintf('[Main:] Database layer is missing! (%s) -> R.I.P.', FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type') )); } @@ -50,6 +50,3 @@ $connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddlewa // Is the app variable there and valid? // @TODO Rewrite this if (is_object($app)) $app->setDatabaseInstance($connectionInstance); - -// [EOF] -?>