Browse Source

- Fix a HTML error in the Chat messages

pull/16/head
Jaussoin Timothée 11 years ago
parent
commit
455d2ee30d
  1. 2
      app/widgets/Chat/_chat_messages.tpl
  2. 2
      app/widgets/Contact/_contact_explore.tpl
  3. 3
      src/Movim/Daemon/Core.php

2
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}
<span class="info">{$value->delivered|strtotime|prepareDate}</span>

2
app/widgets/Contact/_contact_explore.tpl

@ -2,7 +2,7 @@
<ul class="active">
{loop="$users"}
<li class="condensed">
<li class="condensed" onclick="Contact_ajaxGetContact('{$valie->jid}');">
<span class="icon bubble"><img class="avatar" src="{$value->getPhoto('m')}"/></span>
<span>{$value->getTrueName()}</span>
<p>

3
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;
}

Loading…
Cancel
Save