From 30024fd3537de51d520d2be66c79f0df330ee6ed Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Fri, 30 Mar 2018 21:27:57 +0200
Subject: [PATCH] Fix parziale #203

---
 include/configuration.php | 7 ++++++-
 src/Database.php          | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/configuration.php b/include/configuration.php
index 1370565f8..0b97b465e 100644
--- a/include/configuration.php
+++ b/include/configuration.php
@@ -27,7 +27,12 @@ if (post('db_host') !== null) {
     $valid_config = isset($db_host) && isset($db_name) && isset($db_username) && isset($db_password);
 
     // Generazione di una nuova connessione al database
-    $dbo = Database::getConnection(true);
+    $dbo = Database::getConnection(true, [
+        'db_host' => $db_host,
+        'db_name' => $db_name,
+        'db_username' => $db_username,
+        'db_password' => $db_password,
+    ]);
 
     // Test della configurazione
     if (post('test') !== null) {
diff --git a/src/Database.php b/src/Database.php
index 8db2f9f8e..ce613f5b8 100644
--- a/src/Database.php
+++ b/src/Database.php
@@ -116,13 +116,16 @@ class Database extends Util\Singleton
      *
      * @return Database
      */
-    public static function getConnection($new = false)
+    public static function getConnection($new = false, $data = [])
     {
         $class = get_called_class();
 
         if (empty(parent::$instance[$class]) || !parent::$instance[$class]->isConnected() || $new) {
             $config = App::getConfig();
 
+            // Sostituzione degli eventuali valori aggiuntivi
+            $config = array_merge($config, $data);
+
             parent::$instance[$class] = new self($config['db_host'], $config['db_username'], $config['db_password'], $config['db_name']);
         }