Merge branch 'dev' into 'dev'

Fix use UNIX socket file to connect DB

See merge request hubzilla/core!1587

2 files changed, 2 insertions, 2 deletions

diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index 5002f53e7..a70e4a1d7 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -19,7 +19,7 @@ class dba_pdo extends dba_driver {
 		$this->driver_dbtype = $scheme;
 
 		if(strpbrk($server,':;')) {
-			$dsn = $server;
+			$dsn = $this->driver_dbtype . ':unix_socket=' . trim($server, ':;');
 		}
 		else {
 			$dsn = $this->driver_dbtype . ':host=' . $server . (intval($port) ? ';port=' . $port : '');
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 07725e3f4..509942530 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -12,7 +12,7 @@
 
 // Then set the following for your MySQL installation
 
-$db_host = 'your.mysqlhost.com'; // Use 'localhost' if you aren't using a remote server
+$db_host = 'your.mysqlhost.com'; // Use 'localhost' or ':/path/to/socket.file' if you aren't using a remote server
 $db_port = 0;                    // leave 0 for default or set your port
 $db_user = 'mysqlusername';
 $db_pass = 'mysqlpassword';