RCMAIL_CHARSET -> RCUBE_CHARSET (#6236)

7 years ago · 5832eca405
parent db24050215
commit 5832eca405
2 changed files with 2 additions and 2 deletions
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@ -1280,7 +1280,7 @@ EOF;
                        $value = $_SESSION[$name];
                        break;
                    case 'cookie':
-                        $value = htmlspecialchars($_COOKIE[$name], ENT_COMPAT | ENT_HTML401, RCMAIL_CHARSET);
+                        $value = htmlspecialchars($_COOKIE[$name], ENT_COMPAT | ENT_HTML401, RCUBE_CHARSET);
                        break;
                    case 'browser':
                        $value = $this->browser->{$name};
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@ -34,7 +34,7 @@ if ($uid) {

    if ($source !== false) {
        $source = trim(rcube_charset::clean($source));
-        $source = htmlspecialchars($source, ENT_COMPAT | ENT_HTML401, RCMAIL_CHARSET);
+        $source = htmlspecialchars($source, ENT_COMPAT | ENT_HTML401, RCUBE_CHARSET);
        $source = preg_replace(
            array(
                '/\n[\t\s]+/',