Merge remote-tracking branch 'origin/develop' into develop

2021-05-12 19:04:37 +03:00 · 2021-05-12 19:04:37 +03:00 · 4a383469a3
parent 5c7350e28f ed70fe9442
commit 4a383469a3
1 changed files with 1 additions and 1 deletions
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@ -587,7 +587,7 @@ Common.Utils.String = new (function() {
        },

        htmlEncode: function(string) {
-            return !!_ ? _.escape(string) :
+            return (typeof _ !== 'undefined') ? _.escape(string) :
                            string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
        },