diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-09 01:18:36 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-09 01:18:36 -0700 |
| commit | 58c9f516b3e62a6bc168de35dcff759dae01b5d7 (patch) | |
| tree | f5fcf57e92fc3c5b347d544fb993a8f83b95f792 /include/items.php | |
| parent | 8ce4814835e10dc579036be9ff4e61077df875ae (diff) | |
| download | volse-hubzilla-58c9f516b3e62a6bc168de35dcff759dae01b5d7.tar.gz volse-hubzilla-58c9f516b3e62a6bc168de35dcff759dae01b5d7.tar.bz2 volse-hubzilla-58c9f516b3e62a6bc168de35dcff759dae01b5d7.zip | |
private mail isues
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 78c9cb4dd..f4bc2e876 100755 --- a/include/items.php +++ b/include/items.php @@ -1584,12 +1584,10 @@ function get_mail_elements($x) { $arr['mail_obscured'] = 1; if($arr['body']) { $arr['body'] = str_rot47(base64url_encode($arr['body'])); - $arr['body'] = htmlspecialchars($arr['body'],ENT_COMPAT,'UTF-8',false); } if($arr['title']) { $arr['title'] = str_rot47(base64url_encode($arr['title'])); - $arr['title'] = htmlspecialchars($arr['title'],ENT_COMPAT,'UTF-8',false); } if($arr['created'] > datetime_convert()) $arr['created'] = datetime_convert(); @@ -3453,8 +3451,10 @@ function mail_store($arr) { return 0; } - if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) - $arr['body'] = escape_tags($arr['body']); + if(! $arr['mail_obscured']) { + if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) + $arr['body'] = escape_tags($arr['body']); + } if(array_key_exists('attach',$arr) && is_array($arr['attach'])) $arr['attach'] = json_encode($arr['attach']); |