Skip to content
Browse files

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
  • Loading branch information...
1 parent 2a3a0a5 commit 8238123c2c60a976a4ee5acaac8194a65dcf7942 @roojs roojs committed Oct 3, 2011
Showing with 2 additions and 1 deletion.
  1. +2 −1 mimeDecode.php
View
3 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);
}

0 comments on commit 8238123

Please sign in to comment.
Something went wrong with that request. Please try again.