Merge remote-tracking branch 'upstream/develop' into 1607-performance

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 082a54bd496694875cb7756974f049c2f065a179..7ca520712a455a31d53d4b92e24800cbcbdac124 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -65,6 +65,7 @@ class dba {
                        $this->db = @new mysqli($server,$user,$pass,$db);
                        if (! mysqli_connect_errno()) {
                                $this->connected = true;
+                               //mysqli_set_charset($this->db, 'utf8');
                        }
                        if (isset($a->config["system"]["db_charset"])) {
                                $this->db->set_charset($a->config["system"]["db_charset"]);
@@ -74,6 +75,7 @@ class dba {
                        $this->db = mysql_connect($server,$user,$pass);
                        if ($this->db && mysql_select_db($db,$this->db)) {
                                $this->connected = true;
+                               //mysql_set_charset('utf8', $this->db);
                        }
                        if (isset($a->config["system"]["db_charset"]))
                                mysql_set_charset($a->config["system"]["db_charset"], $this->db);