Merge branch 'propel'

Conflicts: install/thelia.sql
2013-10-22 14:48:10 +02:00
parent cb0619a7b3 0e5b902752
commit 6fef556319
1 changed files with 3 additions and 1 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\''))
        );
    }
 }