From a92beb6bdb9cb857e8cee6606033691f11692230 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 27 Nov 2012 08:43:43 +0100 Subject: Define RCUBE_CHARSET in place of RCMAIL_CHARSET for naming consistency --- program/lib/Roundcube/rcube_charset.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'program/lib/Roundcube/rcube_charset.php') 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) -- cgit v1.2.3