Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'charset' into qoqa

Conflicts:
	extensions/data/source/ActiveRecord.php
  • Loading branch information...
commit d8508889518c0e5fbe3475775fcc3b1bf3b869c6 2 parents c409970 + 242a6d2
Yoan Blanc authored

Showing 1 changed file with 3 additions and 2 deletions. Show diff stats Hide diff stats

  1. +3 2 extensions/data/source/ActiveRecord.php
5 extensions/data/source/ActiveRecord.php
@@ -16,6 +16,7 @@ public function __construct(array $config=array()) {
16 16 'login' => 'root',
17 17 'password' => '',
18 18 'database' => 'li3',
  19 + 'charset' => 'utf8',
19 20 'cache' => false,
20 21 'cache_expire' => 30
21 22 ), $config);
@@ -24,7 +25,7 @@ public function __construct(array $config=array()) {
24 25 $connection = String::insert(
25 26 $driver == 'sqlite' ?
26 27 'sqlite://{:database}.db' :
27   - '{:driver}://{:login}:{:password}@{:host}/{:database}',
  28 + '{:driver}://{:login}:{:password}@{:host}/{:database}?charset={:charset}',
28 29 $config
29 30 );
30 31 if ($config['cache']) {
@@ -58,4 +59,4 @@ protected function _insertId($query) {}
58 59
59 60 }
60 61
61   -?>
  62 +?>

0 comments on commit d850888

Please sign in to comment.
Something went wrong with that request. Please try again.