Evn more quotes rewritten, old try-catch-blocks removed from old tests

[core.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index 30792197135d5d46a6e70f4d9112128bbc285e8f..544a2a55dc3f51f4b487336b620d4953c8b05b0f 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -49,35 +49,10 @@ if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
 unset($INC);
 
 // Prepare database instance
 unset($INC);
 
 // Prepare database instance

-try {
-       $db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);
-} catch (NullPointerException $e) {
-       ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-               $e->getMessage()
-       ));
-} catch (InvalidDirectoryResourceException $e) {
-       ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-               $e->getMessage()
-       ));
-} catch (PathIsEmptyException $e) {
-       ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-               $e->getMessage()
-       ));
-} catch (PathIsNoDirectoryException $e) {
-       ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-               $e->getMessage()
-       ));
-} catch (PathReadProtectedException $e) {
-       ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-               $e->getMessage()
-       ));
-} catch (DirPointerNotOpenedException $e) {
-       ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
-               $e->getMessage()
-       ));
-}
+$db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);

 
 // Is the app variable there and valid?
 
 // Is the app variable there and valid?

+// @TODO Rewrite this

 if (is_object($app)) $app->setDatabaseInstance($db);
 
 // [EOF]
 if (is_object($app)) $app->setDatabaseInstance($db);
 
 // [EOF]