MDB2 now works with UTF-8

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 0df9164b40c81217636137dca29f948132c0a7a3..99056541c5328f126b2546280ad1a3311e3b6cbc 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -773,9 +773,9 @@ class Memcached_DataObject extends Safe_DataObject
                 common_config('db', 'utf8')) {
                 $conn = $DB->connection;
                 if (!empty($conn)) {
-                    if ($DB instanceof DB_mysqli) {
+                    if ($DB instanceof DB_mysqli || $DB instanceof MDB2_Driver_mysqli) {
                         mysqli_set_charset($conn, 'utf8');
-                    } else if ($DB instanceof DB_mysql) {
+                    } else if ($DB instanceof DB_mysql || $DB instanceof MDB2_Driver_mysql) {
                         mysql_set_charset('utf8', $conn);
                     }
                 }