Aleksander Machniak
2012-12-18 d2534c63f2c0b640a39fce2a71b14a5dcda6e7fd
program/lib/Roundcube/rcube_charset.php
@@ -2,8 +2,6 @@
/*
 +-----------------------------------------------------------------------+
 | program/include/rcube_charset.php                                     |
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
 | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -15,7 +13,6 @@
 |                                                                       |
 | PURPOSE:                                                              |
 |   Provide charset conversion functionality                            |
 |                                                                       |
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 | Author: Aleksander Machniak <alec@alec.pl>                            |
@@ -169,7 +166,7 @@
     *
     * @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 +177,7 @@
        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)