From a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Mon, 07 Oct 2013 13:19:03 -0400
Subject: [PATCH] Merge pull request #133 from cwickert/release-0.9-canned-responses
---
program/lib/utf8.class.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php
index 9f718d5..0446159 100644
--- a/program/lib/utf8.class.php
+++ b/program/lib/utf8.class.php
@@ -35,7 +35,7 @@
*/
// Charset maps
-// Adapted to fit RoundCube
+// Adapted to fit Roundcube
define("UTF8_MAP_DIR", "program/lib/encoding");
//Error constants
@@ -60,8 +60,8 @@
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;
--
Gitblit v1.9.1