fix smiles

jquery-emotions/jquery.emotions.js

@@ -81,9 +81,15 @@
                 var rep = $s.replacement
                     .replace(/\{eId\}/g, $s.map[pattern]);
 
-                text = text
+                if (pattern[0] === ';') {
-                    .replace(new RegExp($t.quote(pattern), "g"), rep)
+                    text = text
-                    .replace(new RegExp($t.quote(encPattent), "g"), rep);
+                        .replace(new RegExp("(^|\W)" + $t.quote(pattern), "g"), "\\1" + rep)
+                        .replace(new RegExp("(^|\W)" + $t.quote(encPattent), "g"), "\\1" + rep);
+                } else {
+                    text = text
+                        .replace(new RegExp($t.quote(pattern), "g"), rep)
+                        .replace(new RegExp($t.quote(encPattent), "g"), rep);
+                }
             }
 
             return text;

js/twister_formatpost.js

@@ -238,9 +238,7 @@ function htmlFormatMsg( msg, output, mentions ) {
 
 function _parseText(text)
 {
-    text = unescapeHtmlEntities(text);
     text = $.emotions(text);
-    text = escapeHtmlEntities(text);
     return text;
 }