Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

public/javascripts/wechat/others/factory.js

@@ -111,7 +111,7 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
         }
 
         var temp =  data.comment.replace(/\n/g,'<br/>');
-        temp = temp.replaceAll("[^\\u0000-\\uFFFF]", "[表情]");
+        temp = temp.replace(/^\:[a-z0-9_]+\:$/g, "[表情]");
 
         var userInfo = {
             type: type,