diff --git a/app/widgets/Chat/_chat_messages.tpl b/app/widgets/Chat/_chat_messages.tpl index 95d965b95..3db6d0160 100644 --- a/app/widgets/Chat/_chat_messages.tpl +++ b/app/widgets/Chat/_chat_messages.tpl @@ -22,7 +22,7 @@ {if="isset($value->html)"} {$value->body} {else} - {$value->body|prepareString|htmlentities:ENT_COMPAT,'UTF-8'} + {$value->body|htmlentities:ENT_COMPAT,'UTF-8'|prepareString} {/if} {/if} {$value->delivered|strtotime|prepareDate} diff --git a/app/widgets/Contact/_contact_explore.tpl b/app/widgets/Contact/_contact_explore.tpl index 728538b35..a566ac2af 100644 --- a/app/widgets/Contact/_contact_explore.tpl +++ b/app/widgets/Contact/_contact_explore.tpl @@ -2,7 +2,7 @@
diff --git a/src/Movim/Daemon/Core.php b/src/Movim/Daemon/Core.php index 011a44069..f8f7bb4af 100644 --- a/src/Movim/Daemon/Core.php +++ b/src/Movim/Daemon/Core.php @@ -52,10 +52,11 @@ class Core implements MessageComponentInterface { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection \"Upgrade\"; proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; + proxy_read_timeout 86400s; + proxy_send_timeout 86400s; proxy_redirect off; }