[FIX] mail: heart emoji not correctly replaced

Fixes #10445
2016-01-15 13:18:13 +01:00
parent 7e3c6bd366
commit e5e31a0519
2 changed files with 2 additions and 2 deletions
@@ -74,7 +74,7 @@
        </record>

        <record id="mail_smiley_heart" model="mail.shortcode">
-            <field name="source">&amp;lt;3</field>
+            <field name="source">&lt;3</field>
            <field name="substitution">&lt;img src='/mail/static/src/img/smiley/heart.png'/&gt;</field>
            <field name="description">Emoji Heart</field>
            <field name="shortcode_type">image</field>
@@ -975,7 +975,7 @@ function init () {
    var load_emojis = session.rpc("/mail/chat_init").then(function (result) {
        emojis = result.emoji;
        _.each(emojis, function(emoji) {
-            emoji_substitutions[emoji.source] = emoji.substitution;
+            emoji_substitutions[_.escape(emoji.source)] = emoji.substitution;
        });
    });