Set Database attribute in Application class

2 files changed, 13 insertions, 14 deletions

diff --git a/core/application.php b/core/application.php
index e4c481f..21ab203 100644
--- a/core/application.php
+++ b/core/application.php
@@ -142,19 +142,6 @@ $Language = Application::getLanguage();
 $Database = Application::getDatabase();
 
 #===============================================================================
-# Set Database attributes
-#===============================================================================
-$Database->setAttribute(
-	$Database::ATTR_DEFAULT_FETCH_MODE,
-	$Database::FETCH_ASSOC
-);
-
-$Database->setAttribute(
-	$Database::ATTR_ERRMODE,
-	$Database::ERRMODE_EXCEPTION
-);
-
-#===============================================================================
 # Check if "304 Not Modified" and ETag header should be sent
 #===============================================================================
 if(Application::get('CORE.SEND_304') === TRUE AND !defined('ADMINISTRATION')) {
diff --git a/core/namespace/Application.php b/core/namespace/Application.php
index 1597801..3cecf3b 100644
--- a/core/namespace/Application.php
+++ b/core/namespace/Application.php
@@ -44,7 +44,19 @@ class Application {
 			$username = self::get('DATABASE.USERNAME');
 			$password = self::get('DATABASE.PASSWORD');
 
-			self::$Database = new Database($hostname, $basename, $username, $password);
+			$Database = new Database($hostname, $basename, $username, $password);
+
+			$Database->setAttribute(
+				$Database::ATTR_DEFAULT_FETCH_MODE,
+				$Database::FETCH_ASSOC
+			);
+
+			$Database->setAttribute(
+				$Database::ATTR_ERRMODE,
+				$Database::ERRMODE_EXCEPTION
+			);
+
+			self::$Database = $Database;
 		}
 
 		return self::$Database;