From a92beb6bdb9cb857e8cee6606033691f11692230 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 27 Nov 2012 08:43:43 +0100
Subject: Define RCUBE_CHARSET in place of RCMAIL_CHARSET for naming
 consistency

---
 program/lib/Roundcube/bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'program/lib/Roundcube/bootstrap.php')

diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 47020c1ab..eed7db8c1 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -49,7 +49,7 @@ foreach ($config as $optname => $optval) {
 
 // framework constants
 define('RCUBE_VERSION', '0.9-git');
-define('RCMAIL_CHARSET', 'UTF-8');
+define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {
     define('RCUBE_LIB_DIR', dirname(__FILE__).'/');
@@ -73,8 +73,8 @@ if (!defined('RCUBE_LOCALIZATION_DIR')) {
 
 // set internal encoding for mbstring extension
 if (extension_loaded('mbstring')) {
-    mb_internal_encoding(RCMAIL_CHARSET);
-    @mb_regex_encoding(RCMAIL_CHARSET);
+    mb_internal_encoding(RCUBE_CHARSET);
+    @mb_regex_encoding(RCUBE_CHARSET);
 }
 
 // Register autoloader
-- 
cgit v1.2.3