aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-20 01:12:35 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-20 01:12:35 -0700
commit5786fd2221f1812620084420c0dca578d83a1a2f (patch)
tree00ee1c94ee81507b9ff7f51f45429ec6ff8bf24d /include
parent419b4ecfde2c636da41a07033b279d3aaf21b067 (diff)
downloadvolse-hubzilla-5786fd2221f1812620084420c0dca578d83a1a2f.tar.gz
volse-hubzilla-5786fd2221f1812620084420c0dca578d83a1a2f.tar.bz2
volse-hubzilla-5786fd2221f1812620084420c0dca578d83a1a2f.zip
extra encoding on mail titles
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php2
-rw-r--r--include/text.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index d8c551cea..0079e0e55 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3492,7 +3492,7 @@ function mail_store($arr) {
$arr['to_xchan'] = ((x($arr,'to_xchan')) ? notags(trim($arr['to_xchan'])) : '');
$arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert());
$arr['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : NULL_DATE);
- $arr['title'] = ((x($arr,'title')) ? notags(trim($arr['title'])) : '');
+ $arr['title'] = ((x($arr,'title')) ? trim($arr['title']) : '');
$arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : '');
$arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : '');
diff --git a/include/text.php b/include/text.php
index cc084f6f1..f27a9ce68 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1305,7 +1305,7 @@ function theme_attachments(&$item) {
$title = htmlspecialchars($r['title'], ENT_COMPAT,'UTF-8');
if(! $title)
$title = t('unknown.???');
- $title .= ' ' . $r['length'] . ' ' . t('bytes');
+ $title .= ' ' . (($r['length']) ? $r['length'] . ' ' . t('bytes') : '');
require_once('include/identity.php');
if(is_foreigner($item['author_xchan']))