TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'propel'

Browse Source 
Conflicts:
	install/thelia.sql
This commit is contained in:
Manuel Raynaud
2013-10-22 14:48:10 +02:00
parent cb0619a7b3 0e5b902752
commit 6fef556319
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Config/DefinePropel.php
View File

@@ -44,7 +44,9 @@ class DefinePropel
"dsn" => $connection["dsn"], "dsn" => $connection["dsn"],
"user" => $connection["user"], "user" => $connection["user"],
"password" => $connection["password"], "password" => $connection["password"],
"classname" => $connection["classname"] "classname" => $connection["classname"],
'options' => array(
\PDO::MYSQL_ATTR_INIT_COMMAND => array('value' =>'SET NAMES \'UTF8\''))
); );
} }
} }