mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-09 06:37:01 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

Browse Source 
Conflicts:
	plugins/box/users/views/frontend/login.view.php
This commit is contained in:
Awilum
2013-11-21 21:06:22 +02:00
parent 8f930f8c6d a5c197fa99
commit 31c661a1e8
45 changed files with 960 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/Monstra.php
View File

@@ -184,6 +184,7 @@ class Monstra
ORM::configure(MONSTRA_DB_DSN);
ORM::configure('username', MONSTRA_DB_USER);
ORM::configure('password', MONSTRA_DB_PASSWORD);
ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
}
/**