From d98fbf3921aaf0cdf476c0d302b36cb4c2b495bf Mon Sep 17 00:00:00 2001
From: "silver%warwickcompsoc.co.uk"
 <silver%warwickcompsoc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 21 Jan 2005 01:38:14 +0000
Subject: [PATCH] Bug 276764 - Strict JS warning fix, variable relocation, and
 a copy-paste error fixed. ChatZilla only. r=samuel@sieb.net
 p=gautheri@noos.fr (Serge GAUTHERIE)

git-svn-id: svn://10.0.0.236/trunk@168110 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/irc/xul/content/commands.js |  7 ++++---
 mozilla/extensions/irc/xul/content/prefs.js    | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mozilla/extensions/irc/xul/content/commands.js b/mozilla/extensions/irc/xul/content/commands.js
index 2b26798e71e..39b46b4d6e7 100644
--- a/mozilla/extensions/irc/xul/content/commands.js
+++ b/mozilla/extensions/irc/xul/content/commands.js
@@ -658,7 +658,7 @@ function dispatchCommand (command, e, flags)
             return null;
         commandList = commandList.split(";");
 
-        var i = 0;
+        i = 0;
         while (i < commandList.length) {
             if (commandList[i].match(/(?:^|[^\\])(?:\\\\)*$/) || 
                 (i == commandList.length - 1)) 
@@ -848,6 +848,7 @@ function cmdChanUserMode(e)
     }
 
     var nicks;
+    var user;
     // Prefer pre-canonicalised list, then a normal list, then finally a
     // sigular item (canon. or otherwise).
     if (e.canonNickList)
@@ -859,7 +860,7 @@ function cmdChanUserMode(e)
         var nickList = new Array();
         for (i = 0; i < e.nicknameList.length; i++)
         {
-            var user = e.channel.getUser(e.nicknameList[i]);
+            user = e.channel.getUser(e.nicknameList[i]);
             if (!user)
             {
                 display(getMsg(MSG_ERR_UNKNOWN_USER, e.nicknameList[i]), MT_ERROR);
@@ -874,7 +875,7 @@ function cmdChanUserMode(e)
         user = e.channel.getUser(e.nickname);
         if (!user)
         {
-            display(getMsg(MSG_ERR_UNKNOWN_USER, e.nicknameList[i]), MT_ERROR);
+            display(getMsg(MSG_ERR_UNKNOWN_USER, e.nickname), MT_ERROR);
             return;
         }
         var str = new String(user.encodedName);
diff --git a/mozilla/extensions/irc/xul/content/prefs.js b/mozilla/extensions/irc/xul/content/prefs.js
index 2fbc7029c14..f045ed259ac 100644
--- a/mozilla/extensions/irc/xul/content/prefs.js
+++ b/mozilla/extensions/irc/xul/content/prefs.js
@@ -258,17 +258,21 @@ function makeLogName(obj, type)
             // Remember to encode these, don't want some dodgy # breaking stuff.
             if (longName in longCodes)
                 return encode(longCodes[longName]);
+
             dd("Unknown long code: " + longName);
-            return match;
         }
         else if (typeof shortName != "undefined" && shortName)
         {
             if (shortName in shortCodes)
                 return encode(shortCodes[shortName]);
+
             dd("Unknown short code: " + shortName);
-            return match;
         }
-        dd("Unknown match: " + match);
+        else
+        {
+            dd("Unknown match: " + match);
+        }
+
         return match;
     };