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 @@
9
- 5324
+ 5325
0000-00-00