diff options
author | Robert Ros <robert@robertros.nl> | 2014-09-18 21:33:22 +0200 |
---|---|---|
committer | Robert Ros <robert@robertros.nl> | 2014-09-18 22:29:22 +0200 |
commit | b668db242de35f13de0b317ceaa209574458e9c8 (patch) | |
tree | bb6cf02a2049f25a67645161f32d3fb05aa2bccd /inc/poche | |
parent | a15108e65b12ceaf50821783bcaa1ee3fee10d13 (diff) | |
download | wallabag-b668db242de35f13de0b317ceaa209574458e9c8.tar.gz wallabag-b668db242de35f13de0b317ceaa209574458e9c8.tar.zst wallabag-b668db242de35f13de0b317ceaa209574458e9c8.zip |
Convert the MySQL charset to utf8mb4 to support the full range of unicode characters
Diffstat (limited to 'inc/poche')
-rwxr-xr-x | inc/poche/Database.class.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index dfd7ae34..7aaf9740 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php | |||
@@ -24,15 +24,17 @@ class Database { | |||
24 | switch (STORAGE) { | 24 | switch (STORAGE) { |
25 | case 'sqlite': | 25 | case 'sqlite': |
26 | // Check if /db is writeable | 26 | // Check if /db is writeable |
27 | if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) { | 27 | if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) { |
28 | die('An error occured: "db" directory must be writeable for your web server user!'); | 28 | die('An error occured: "db" directory must be writeable for your web server user!'); |
29 | } | 29 | } |
30 | $db_path = 'sqlite:' . STORAGE_SQLITE; | 30 | $db_path = 'sqlite:' . STORAGE_SQLITE; |
31 | $this->handle = new PDO($db_path); | 31 | $this->handle = new PDO($db_path); |
32 | break; | 32 | break; |
33 | case 'mysql': | 33 | case 'mysql': |
34 | $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB; | 34 | $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB . ';charset=utf8mb4'; |
35 | $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD); | 35 | $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD, array( |
36 | PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', | ||
37 | )); | ||
36 | break; | 38 | break; |
37 | case 'postgres': | 39 | case 'postgres': |
38 | $db_path = 'pgsql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB; | 40 | $db_path = 'pgsql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB; |