summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-11-27 12:42:42 +0100
committerAleksander Machniak <alec@alec.pl>2012-11-27 12:42:42 +0100
commit63f130782c65c64daa8a51044e58a6a8471aa57a (patch)
treefdddbb4470da0de68e80865d6e31bc4e480de643
parent60226a75d8e4a3ee9504da6eab6d8f329bb32e7b (diff)
Small fixes to last commits
-rw-r--r--program/include/rcmail_output_json.php2
-rw-r--r--program/lib/Roundcube/rcube_output.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcmail_output_json.php b/program/include/rcmail_output_json.php
index 22edce9bd..def6ee42c 100644
--- a/program/include/rcmail_output_json.php
+++ b/program/include/rcmail_output_json.php
@@ -2,7 +2,7 @@
/*
+-----------------------------------------------------------------------+
- | program/include/rc,aiö_output_json.php |
+ | program/include/rcmail_output_json.php |
| |
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2008-2012, The Roundcube Dev Team |
diff --git a/program/lib/Roundcube/rcube_output.php b/program/lib/Roundcube/rcube_output.php
index ca8d83ef3..4ef42f598 100644
--- a/program/lib/Roundcube/rcube_output.php
+++ b/program/lib/Roundcube/rcube_output.php
@@ -31,7 +31,7 @@ abstract class rcube_output
protected $app;
protected $config;
- protected $charset = RCMAIL_CHARSET;
+ protected $charset = RCUBE_CHARSET;
protected $env = array();