diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-10 07:14:38 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-10 07:14:38 +0000 |
| commit | dfcd869f3748132755de63db9e7eabb6dee41af1 (patch) | |
| tree | be3dd469962b3b40a7b0462492a44e6586e12e5f /lib/class/dba.class.php | |
| parent | 9393b2afdf8e6222f06aec019f872c02c0a2c19f (diff) | |
| download | ampache-dfcd869f3748132755de63db9e7eabb6dee41af1.tar.gz ampache-dfcd869f3748132755de63db9e7eabb6dee41af1.tar.bz2 ampache-dfcd869f3748132755de63db9e7eabb6dee41af1.zip | |
tweaks the db updates and adds a few more charset translations to the db charset reset function
Diffstat (limited to 'lib/class/dba.class.php')
| -rw-r--r-- | lib/class/dba.class.php | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/class/dba.class.php b/lib/class/dba.class.php index 6ead8b8b..62df46fe 100644 --- a/lib/class/dba.class.php +++ b/lib/class/dba.class.php @@ -262,6 +262,21 @@ class Dba { // MySQL translte real charset names into fancy smancy MySQL land names switch (strtoupper(Config::get('site_charset'))) { + case 'CP1250': + case 'WINDOWS-1250': + case 'WINDOWS-1252': + $target_charset = 'cp1250'; + $target_collation = 'cp1250_general_ci'; + break; + case 'ISO-8859': + case 'ISO-8859-2': + $target_charset = 'latin2'; + $target_collation = 'latin2_general_ci'; + break; + case 'ISO-8859-1': + $target_charset = 'latin1'; + $target_charset = 'latin1_general_ci'; + break; case 'EUC-KR': $target_charset = 'euckr'; $target_collation = 'euckr_korean_ci'; @@ -278,10 +293,6 @@ class Dba { $target_charset = 'koi8r'; $target_collation = 'koi8r_general_ci'; break; - case 'ISO-8859': - $target_charset = 'latin2'; - $target_collation = 'latin2_general_ci'; - break; default; case 'UTF-8': $target_charset = 'utf8'; |