From 99979ea41c9cd9162b6df4394cfaf4164e88fd69 Mon Sep 17 00:00:00 2001
From: Savetheinternet <savetheinternet@tinyboard.org>
Date: Sat, 5 Nov 2011 17:35:07 +1100
Subject: [PATCH] Ensure UTF-8 for MySQL

---
 inc/database.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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();