From 9546d22c67fda4cbc4a9141dca11944e885ce8a7 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 15 Oct 2012 08:35:56 -0400
Subject: [PATCH] Avoid unnecessary strtoupper() calls but validate target charset if specified
---
program/include/rcube_charset.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php
index 35c6972..50ddc19 100644
--- a/program/include/rcube_charset.php
+++ b/program/include/rcube_charset.php
@@ -179,7 +179,7 @@
static $mbstring_sch = null;
static $conv = null;
- $to = empty($to) ? strtoupper(RCMAIL_CHARSET) : $to;
+ $to = empty($to) ? RCMAIL_CHARSET : self::parse_charset($to);
$from = self::parse_charset($from);
// It is a common case when UTF-16 charset is used with US-ASCII content (#1488654)
--
Gitblit v1.9.1