diff options
| -rwxr-xr-x | include/items.php | 10 | ||||
| -rw-r--r-- | view/css/conversation.css | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/items.php b/include/items.php index ab42b7cd3..83ee219a2 100755 --- a/include/items.php +++ b/include/items.php @@ -980,11 +980,7 @@ function empty_acl($item) { } function encode_item($item,$mirror = false) { - $x = array(); - $x['type'] = 'activity'; - $x['encoding'] = 'zot'; - -// logger('encode_item: ' . print_r($item,true)); + $x = []; $r = q("select channel_id from channel where channel_id = %d limit 1", intval($item['uid']) @@ -1362,9 +1358,7 @@ function encode_item_flags($item) { } function encode_mail($item,$extended = false) { - $x = array(); - $x['type'] = 'mail'; - $x['encoding'] = 'zot'; + $x = []; if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) { if($item['title']) diff --git a/view/css/conversation.css b/view/css/conversation.css index 0f69ffaba..e6324b30d 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -297,7 +297,6 @@ code { font-size: 1em; padding: 1em 1.5em; display: block; - white-space: pre-wrap; } code.inline-code { |