Apply channel linking before colour linking so colours aren't interpreted as channels

diff --git a/js/front.js b/js/front.js
index e0c107f95c25dc31eaecd61bafd98cf72c138e87..b699f7cb3b7935d96512051eb2ed54c3a9d658da 100644 (file)
--- a/js/front.js
+++ b/js/front.js
@@ -1242,6 +1242,10 @@ kiwi.front = {
     format: function (msg) {
         var re;
         
+        if ((!msg) || (typeof msg !== 'string')) {
+            return;
+        }
+        
         // bold
         if (msg.indexOf(String.fromCharCode(2)) !== -1) {
             next = '<b>';
@@ -1572,14 +1576,14 @@ Tabview.prototype.addMsg = function (time, nick, msg, type, style) {
         msg = '';
     }
     
-    msg = kiwi.front.format(msg);
-    
     // Make the channels clickable
     re = new RegExp('\\B(' + kiwi.gateway.channel_prefix + '[^ ,.\\007]+)', 'g');
     msg = msg.replace(re, function (match) {
         return '<a class="chan">' + match + '</a>';
     });
 
+    msg = kiwi.front.format(msg);
+    
     // Build up and add the line
     line_msg = $('<div class="msg ' + type + '"><div class="time">' + time + '</div><div class="nick">' + nick + '</div><div class="text" style="' + style + '">' + msg + ' </div></div>');
     this.div.append(line_msg);