From 8238123c2c60a976a4ee5acaac8194a65dcf7942 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 3 Oct 2011 23:37:20 +0000 Subject: [PATCH] check return on both iconv calls git-svn-id: http://svn.php.net/repository/pear/packages/Mail_Mime/trunk@317689 c90b9560-bf6c-de11-be94-00142212c4b1 --- mimeDecode.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mimeDecode.php b/mimeDecode.php index db84456..a4c3d92 100755 --- a/mimeDecode.php +++ b/mimeDecode.php @@ -758,7 +758,8 @@ function _decodeHeader($input, $default_charset=false) break; } if (is_string($this->_decode_headers)) { - $text = @iconv($charset, $this->_decode_headers, $text); + $conv = @iconv($charset, $this->_decode_headers, $text); + $text = ($conv === false) ? $text : $conv; } $input = str_replace($encoded, $text, $input); }