diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-08 14:28:36 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-08 14:28:36 +0200 |
| commit | a522971cf853b2f0ccd1b569491a06218ebbaee9 (patch) | |
| tree | cf0e8c6bbe0978cf302b112080370b9a01cf5900 /program/lib/utf8.class.php | |
| parent | ea6d6958e0a32c88bf8c00cbd118cfcd48fae096 (diff) | |
| parent | c4723999e21da0b266b0467de6e58cbd26c4b5bf (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts:
program/js/list.js
Diffstat (limited to 'program/lib/utf8.class.php')
| -rw-r--r-- | program/lib/utf8.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php index e0dc9e2bd..0446159c7 100644 --- a/program/lib/utf8.class.php +++ b/program/lib/utf8.class.php @@ -60,8 +60,8 @@ Class utf8 { function loadCharset($charset) { $charset = preg_replace(array('/^WINDOWS-*125([0-8])$/', '/^CP-/'), array('CP125\\1', 'CP'), $charset); - if (isset($aliases[$charset])) - $charset = $aliases[$charset]; + if (isset($this->aliases[$charset])) + $charset = $this->aliases[$charset]; $this->charset = $charset; |