GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make sure we have a DB connection before setting its charset

Browse Source
This commit is contained in:
Zach Copley 2009-06-18 19:19:19 +00:00
parent bde571728d
commit e0fb15c185
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
classes/Memcached_DataObject.php
View File

@ -242,13 +242,16 @@ class Memcached_DataObject extends DB_DataObject
if (common_config('db', 'type') == 'mysql' && if (common_config('db', 'type') == 'mysql' &&
common_config('db', 'utf8')) { common_config('db', 'utf8')) {
$conn = $DB->connection; $conn = $DB->connection;
if ($DB instanceof DB_mysqli) { if (!empty($conn)) {
mysqli_set_charset($conn, 'utf8'); if ($DB instanceof DB_mysqli) {
} else if ($DB instanceof DB_mysql) { mysqli_set_charset($conn, 'utf8');
mysql_set_charset('utf8', $conn); } else if ($DB instanceof DB_mysql) {
mysql_set_charset('utf8', $conn);
}
} }
} }
} }
return $result; return $result;
} }
} }