Merge branch 'master' into tax

2013-10-22 20:20:40 +02:00
parent dba4a129ff 2d987473b4
commit 29d4ecbe35
5 changed files with 27 additions and 7 deletions
--- a/core/lib/Thelia/Config/DefinePropel.php
+++ b/core/lib/Thelia/Config/DefinePropel.php
@@ -44,7 +44,9 @@ class DefinePropel
            "dsn" => $connection["dsn"],
            "user" => $connection["user"],
            "password" => $connection["password"],
-            "classname" => $connection["classname"]
+            "classname" => $connection["classname"],
+            'options' => array(
+                \PDO::MYSQL_ATTR_INIT_COMMAND => array('value' =>'SET NAMES \'UTF8\''))
        );
    }
 }