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_message_header.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_message_header.php b/program/include/rcube_message_header.php
index ad6bc5e..378fb98 100644
--- a/program/include/rcube_message_header.php
+++ b/program/include/rcube_message_header.php
@@ -18,9 +18,6 @@
+-----------------------------------------------------------------------+
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
/**
@@ -208,15 +205,18 @@
/**
* Returns header value
*/
- public function get($name)
+ public function get($name, $decode = true)
{
$name = strtolower($name);
if (isset($this->obj_headers[$name])) {
- return $this->{$this->obj_headers[$name]};
+ $value = $this->{$this->obj_headers[$name]};
+ }
+ else {
+ $value = $this->others[$name];
}
- return $this->others[$name];
+ return $decode ? rcube_mime::decode_header($value, $this->charset) : $value;
}
/**
--
Gitblit v1.9.1