summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-11-27 08:43:43 +0100
committerAleksander Machniak <alec@alec.pl>2012-11-27 08:43:43 +0100
commita92beb6bdb9cb857e8cee6606033691f11692230 (patch)
tree4733c82a5989817bb7d61b0ad9bd12cb62a2b881 /program/include
parent581fe08a050bea2dbdcad30b9a0ea02f5623a3ac (diff)
Define RCUBE_CHARSET in place of RCMAIL_CHARSET for naming consistency
Diffstat (limited to 'program/include')
-rw-r--r--program/include/bc.php1
-rw-r--r--program/include/rcmail.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/program/include/bc.php b/program/include/bc.php
index 8a3d4f918..4c8f8a4cf 100644
--- a/program/include/bc.php
+++ b/program/include/bc.php
@@ -32,6 +32,7 @@ define('RCUBE_INPUT_POST', rcube_utils::INPUT_POST);
define('RCUBE_INPUT_GPC', rcube_utils::INPUT_GPC);
define('JS_OBJECT_NAME', rcmail::JS_OBJECT_NAME);
+define('RCMAIL_CHARSET', RCUBE_CHARSET);
function get_table_name($table)
{
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 72c2fd944..cdafc5e7b 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -345,7 +345,7 @@ class rcmail extends rcube
$this->output->set_env('task', $this->task);
$this->output->set_env('action', $this->action);
$this->output->set_env('comm_path', $this->comm_path);
- $this->output->set_charset(RCMAIL_CHARSET);
+ $this->output->set_charset(RCUBE_CHARSET);
// add some basic labels to client
$this->output->add_label('loading', 'servererror', 'requesttimedout', 'refreshing');