Use a constant for the avatar base path

[friendica.git] / src / Database / Database.php

diff --git a/src/Database/Database.php b/src/Database/Database.php
index effed6e5e9be972ff4e38c75b6e4492d3282af87..88d8d7d0f6ef87baa78cbc7f63dcd2cceeb65c15 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -114,7 +114,7 @@ class Database
                $pass    = trim($this->configCache->get('database', 'password'));
                $db      = trim($this->configCache->get('database', 'database'));
                $charset = trim($this->configCache->get('database', 'charset'));
-                $socket  = trim($this->configCache->get('database', 'socket')); 
+               $socket  = trim($this->configCache->get('database', 'socket')); 
 
                if (!(strlen($server) && strlen($user))) {
                        return false;
@@ -126,7 +126,7 @@ class Database
 
                if (!$this->configCache->get('database', 'disable_pdo') && class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
                        $this->driver = self::PDO;
-                       $connect      = "mysql:host=" . $server . ";dbname=" . $db . ";unix_socket=" . $socket;
+                       $connect      = "mysql:host=" . $server . ";dbname=" . $db;
 
                        if ($port > 0) {
                                $connect .= ";port=" . $port;
@@ -136,6 +136,10 @@ class Database
                                $connect .= ";charset=" . $charset;
                        }
 
+                       if ($socket) {
+                               $connect .= ";$unix_socket=" . $socket;
+                       }
+
                        try {
                                $this->connection = @new PDO($connect, $user, $pass, [PDO::ATTR_PERSISTENT => $persistent]);
                                $this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, $this->pdo_emulate_prepares);
@@ -150,9 +154,9 @@ class Database
                        $this->driver = self::MYSQLI;
 
                        if ($port > 0) {
-                               $this->connection = @new mysqli($server, $user, $pass, $db, $port, $socket);
+                               $this->connection = @new mysqli($server, $user, $pass, $db, $port);
                        } else {
-                               $this->connection = @new mysqli($server, $user, $pass, $db, $socket);
+                               $this->connection = @new mysqli($server, $user, $pass, $db);
                        }
 
                        if (!mysqli_connect_errno()) {
@@ -161,6 +165,11 @@ class Database
                                if ($charset) {
                                        $this->connection->set_charset($charset);
                                }
+
+                               if ($socket) {
+                                       $this->connection->set_socket($socket);
+                               }
+
                        }
                }