From 0e5821166bcffa4a370053fb4432310adb78929c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 6 Jun 2012 09:22:15 +0200
Subject: Decode header value in rcube_mime::get() by default (#1488511)

Conflicts:

	program/include/rcube_message_header.php
	program/include/rcube_mime.php
---
 program/include/rcube_imap_generic.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'program/include/rcube_imap_generic.php')

diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 29dff8613..0ae82eaca 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -83,15 +83,18 @@ class rcube_mail_header
     /**
      * 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;
     }
 
     /**
-- 
cgit v1.2.3