diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-11-27 08:43:43 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-11-27 08:43:43 +0100 |
| commit | a92beb6bdb9cb857e8cee6606033691f11692230 (patch) | |
| tree | 4733c82a5989817bb7d61b0ad9bd12cb62a2b881 /program/lib/Roundcube/rcube_charset.php | |
| parent | 581fe08a050bea2dbdcad30b9a0ea02f5623a3ac (diff) | |
Define RCUBE_CHARSET in place of RCMAIL_CHARSET for naming consistency
Diffstat (limited to 'program/lib/Roundcube/rcube_charset.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_charset.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php index e8cce00e3..6135a5711 100644 --- a/program/lib/Roundcube/rcube_charset.php +++ b/program/lib/Roundcube/rcube_charset.php @@ -169,7 +169,7 @@ class rcube_charset * * @param string Input string * @param string Suspected charset of the input string - * @param string Target charset to convert to; defaults to RCMAIL_CHARSET + * @param string Target charset to convert to; defaults to RCUBE_CHARSET * * @return string Converted string */ @@ -180,7 +180,7 @@ class rcube_charset static $mbstring_sch = null; static $conv = null; - $to = empty($to) ? RCMAIL_CHARSET : $to; + $to = empty($to) ? RCUBE_CHARSET : $to; $from = self::parse_charset($from); // It is a common case when UTF-16 charset is used with US-ASCII content (#1488654) |