extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

test on 'null', as json_last_error is a php5.3.x function

Browse Source
This commit is contained in:
Klaus Leithoff 2011-06-22 10:48:00 +00:00
parent 5c0383bac6
commit 5f175e23fd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
felamimail/inc/class.uidisplay.inc.php
View File

@ -1364,7 +1364,8 @@ pre {
{
$test = json_encode($singleBodyPart['body']);
//error_log(__METHOD__.__LINE__.'#'.$test.'# ->'.strlen($singleBodyPart['body']).' Error:'.json_last_error());
if (json_last_error() != JSON_ERROR_NONE && strlen($singleBodyPart['body'])>0)
//if (json_last_error() != JSON_ERROR_NONE && strlen($singleBodyPart['body'])>0)
if ($test=="null" && strlen($singleBodyPart['body'])>0)
{
// this should not be needed, unless something fails with charset detection/ wrong charset passed
error_log(__METHOD__.__LINE__.' Charset Reported:'.$singleBodyPart['charSet'].' Carset Detected:'.felamimail_bo::detect_encoding($singleBodyPart['body']));