From 807b0a6747ea6bdc1a6fe1da151aad23effceb2d Mon Sep 17 00:00:00 2001
From: DariusIII <thunderstorm1977>
Date: Sat, 25 Jun 2016 15:10:32 +0200
Subject: [PATCH] Update lithium connections

---
 Changelog                            | 1 +
 app/config/bootstrap/connections.php | 8 +++++---
 build/nntmux.xml                     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 2b699623a..8ab071cc9 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-06-25 DariusIII
+	* Upd: Update lithium connections
 	* Upd: Composer will prefer source now on install
 2016-06-24 DariusIII
 	* Fix: Fix styling of some pages in Gentele theme
diff --git a/app/config/bootstrap/connections.php b/app/config/bootstrap/connections.php
index 89365e505..575f7ef1e 100644
--- a/app/config/bootstrap/connections.php
+++ b/app/config/bootstrap/connections.php
@@ -91,20 +91,22 @@ if (file_exists($config)) {
 	}
 
 	if (isset($adapter)) {
-		$host = empty(DB_SOCKET) ? DB_HOST : DB_SOCKET;
+		if (empty(DB_SOCKET)) {
+			$host = empty(DB_PORT) ? DB_HOST : DB_HOST.':'.DB_PORT;
+		} else {
+			$host = DB_SOCKET;
+		}
 
 		Connections::add('default',
 			[
 				'type'       => 'database',
 				'adapter'    => $adapter,
 				'host'       => $host,
-				'port'       => DB_PORT,
 				'login'      => DB_USER,
 				'password'   => DB_PASSWORD,
 				'database'   => DB_NAME,
 				'encoding'   => 'UTF-8',
 				'persistent' => false,
-				'socket'	 => DB_SOCKET,
 			]
 		);
 	}
diff --git a/build/nntmux.xml b/build/nntmux.xml
index 4ff78e3c3..fc104aa45 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -8,7 +8,7 @@
 				<precommit>9</precommit>
 				<!-- this is the version of the pre-commit file in githooks NOT the files it calls -->
 			</hooks>
-		<commit>5324</commit></git>
+		<commit>5325</commit></git>
 		<scripts>
 			<last>
 				<date>0000-00-00</date>