From fe2f0be4352ba0bc213a2c6d4dfcbbddea1a551c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 21 Aug 2012 04:50:14 -0400
Subject: [PATCH] Fix possible PHP warning, read default_folders using config->get() to support deprecated option name (default_imap_folders)
---
program/include/rcube_mime.php | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_mime.php b/program/include/rcube_mime.php
index 53655a9..e1f736a 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;
}
--
Gitblit v1.9.1