From b79cc545ec020f7dd4bd83dcd06af3cf2b1fcaff Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 28 Aug 2012 05:20:20 -0400
Subject: [PATCH] Improvements/fixes for Larry skin
---
program/include/rcube_mime.php | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_mime.php b/program/include/rcube_mime.php
index 53655a9..d8e04a9 100644
--- a/program/include/rcube_mime.php
+++ b/program/include/rcube_mime.php
@@ -31,7 +31,7 @@
*/
class rcube_mime
{
- private static $default_charset = RCMAIL_CHARSET;
+ private static $default_charset;
/**
@@ -39,9 +39,7 @@
*/
function __construct($default_charset = null)
{
- if ($default_charset) {
- self::$default_charset = $default_charset;
- }
+ self::$default_charset = $default_charset;
}
@@ -543,10 +541,10 @@
$prefix = $regs[0];
$level = strlen($prefix);
$line = rtrim(substr($line, $level));
- $line = $prefix . rc_wordwrap($line, $length - $level - 2, " \r\n$prefix ");
+ $line = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix ");
}
else if ($line) {
- $line = rc_wordwrap(rtrim($line), $length - 2, " \r\n");
+ $line = self::wordwrap(rtrim($line), $length - 2, " \r\n");
// space-stuffing
$line = preg_replace('/(^|\r\n)(From| |>)/', '\\1 \\2', $line);
}
--
Gitblit v1.9.1