From a92beb6bdb9cb857e8cee6606033691f11692230 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 27 Nov 2012 02:43:43 -0500
Subject: [PATCH] Define RCUBE_CHARSET in place of RCMAIL_CHARSET for naming consistency
---
program/lib/Roundcube/rcube_mime.php | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 25ee31d..98761c5 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -59,7 +59,7 @@
return $charset;
}
- return RCMAIL_CHARSET;
+ return RCUBE_CHARSET;
}
@@ -572,8 +572,9 @@
*/
public static function wordwrap($string, $width=75, $break="\n", $cut=false, $charset=null)
{
- if ($charset && function_exists('mb_internal_encoding'))
+ if ($charset && function_exists('mb_internal_encoding')) {
mb_internal_encoding($charset);
+ }
$para = preg_split('/\r?\n/', $string);
$string = '';
@@ -629,8 +630,9 @@
}
}
- if ($charset && function_exists('mb_internal_encoding'))
- mb_internal_encoding(RCMAIL_CHARSET);
+ if ($charset && function_exists('mb_internal_encoding')) {
+ mb_internal_encoding(RCUBE_CHARSET);
+ }
return $string;
}
--
Gitblit v1.9.1