summaryrefslogtreecommitdiff
path: root/inc/database.php
diff options
context:
space:
mode:
authorSavetheinternet <savetheinternet@tinyboard.org>2011-11-05 17:35:07 +1100
committerSavetheinternet <savetheinternet@tinyboard.org>2011-11-05 17:35:07 +1100
commit99979ea41c9cd9162b6df4394cfaf4164e88fd69 (patch)
tree47d7f389e7dc90c65f32c22df2002909d8ebae41 /inc/database.php
parentb20ba4126a46af72e9edd780ca9dd33a2530a1aa (diff)
Ensure UTF-8 for MySQL
Diffstat (limited to 'inc/database.php')
-rw-r--r--inc/database.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/database.php b/inc/database.php
index 633512b8..72322057 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -44,9 +44,10 @@
$dsn .= ';' . $config['db']['dsn'];
try {
$options = Array(PDO::ATTR_TIMEOUT => $config['db']['timeout']);
+ $options = Array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8');
if($config['db']['persistent'])
$options[PDO::ATTR_PERSISTENT] = true;
- return $pdo = new PDO($dsn, $config['db']['user'], $config['db']['password']);
+ return $pdo = new PDO($dsn, $config['db']['user'], $config['db']['password'], $options);
} catch(PDOException $e) {
$message = $e->getMessage();