From 5a870688b082ec958c99a757139dd2e26b1f8233 Mon Sep 17 00:00:00 2001
From: cmcnulty <cmcnulty@kznf.com>
Date: Mon, 04 Nov 2013 08:47:42 -0500
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into row-focus
---
program/lib/utf8.class.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php
index e0dc9e2..0446159 100644
--- a/program/lib/utf8.class.php
+++ b/program/lib/utf8.class.php
@@ -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