diff options
| author | Andrew Dolgov <[email protected]> | 2021-03-14 12:49:44 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-03-14 12:49:44 +0300 |
| commit | 15b39a534d5a44b4009e01ea15a01b95b414943b (patch) | |
| tree | d55983984b89023957356b452c1172fb3877542c | |
| parent | f7ee812db201ed05e7be6fe47e4bbbda5a1e67e5 (diff) | |
| parent | 1b71cd9f44dc022581119c2fcd67b02fa9843962 (diff) | |
Merge branch 'master' of git.tt-rss.org:fox/tt-rss
| -rwxr-xr-x | classes/db.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/classes/db.php b/classes/db.php index 008275bca..a09c44628 100755 --- a/classes/db.php +++ b/classes/db.php @@ -14,6 +14,9 @@ class Db ORM::configure('username', Config::get(Config::DB_USER)); ORM::configure('password', Config::get(Config::DB_PASS)); ORM::configure('return_result_sets', true); + if (Config::get(Config::DB_TYPE) == "mysql" && Config::get(Config::MYSQL_CHARSET)) { + ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . Config::get(Config::MYSQL_CHARSET))); + } } static function NOW() { @@ -27,8 +30,13 @@ class Db public static function get_dsn() { $db_port = Config::get(Config::DB_PORT) ? ';port=' . Config::get(Config::DB_PORT) : ''; $db_host = Config::get(Config::DB_HOST) ? ';host=' . Config::get(Config::DB_HOST) : ''; + if (Config::get(Config::DB_TYPE) == "mysql" && Config::get(Config::MYSQL_CHARSET)) { + $db_charset = ';charset=' . Config::get(Config::MYSQL_CHARSET); + } else { + $db_charset = ''; + } - return Config::get(Config::DB_TYPE) . ':dbname=' . Config::get(Config::DB_NAME) . $db_host . $db_port; + return Config::get(Config::DB_TYPE) . ':dbname=' . Config::get(Config::DB_NAME) . $db_host . $db_port . $db_charset; } // this really shouldn't be used unless a separate PDO connection is needed |