Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'charset' into qoqa

Conflicts:
	extensions/data/source/ActiveRecord.php
  • Loading branch information...
commit d8508889518c0e5fbe3475775fcc3b1bf3b869c6 2 parents c409970 + 242a6d2
@greut authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 extensions/data/source/ActiveRecord.php
View
5 extensions/data/source/ActiveRecord.php
@@ -16,6 +16,7 @@ public function __construct(array $config=array()) {
'login' => 'root',
'password' => '',
'database' => 'li3',
+ 'charset' => 'utf8',
'cache' => false,
'cache_expire' => 30
), $config);
@@ -24,7 +25,7 @@ public function __construct(array $config=array()) {
$connection = String::insert(
$driver == 'sqlite' ?
'sqlite://{:database}.db' :
- '{:driver}://{:login}:{:password}@{:host}/{:database}',
+ '{:driver}://{:login}:{:password}@{:host}/{:database}?charset={:charset}',
$config
);
if ($config['cache']) {
@@ -58,4 +59,4 @@ protected function _insertId($query) {}
}
-?>
+?>
Please sign in to comment.
Something went wrong with that request. Please try again.