From 7c8882e30e2c1d6ec324bd2c56f2daf04b4a98bd Mon Sep 17 00:00:00 2001
From: James Vega <jamessan@users.sourceforge.net>
Date: Tue, 26 Oct 2004 15:43:58 +0000
Subject: [PATCH] Fix bug #1054660, Optional password argument needs to be
 defaulted to '' instead of None

---
 src/User.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/User.py b/src/User.py
index 30c2dbfcb..646592317 100755
--- a/src/User.py
+++ b/src/User.py
@@ -149,7 +149,7 @@ class User(callbacks.Privmsg):
         ircdb.users.delUser(user.id)
         irc.replySuccess()
     unregister = wrap(unregister, ['private', 'otherUser',
-                                   additional('something')])
+                                   additional('something', '')])
 
     def changename(self, irc, msg, args, user, newname, password):
         """<name> <new name> [<password>]
@@ -170,7 +170,7 @@ class User(callbacks.Privmsg):
             ircdb.users.setUser(user)
             irc.replySuccess()
     changename = wrap(changename, ['private', 'otherUser', 'something',
-                                   additional('something')])
+                                   additional('something', '')])
 
     def addhostmask(self, irc, msg, args, user, hostmask, password):
         """[<name>] [<hostmask>] [<password>]
@@ -195,7 +195,7 @@ class User(callbacks.Privmsg):
                       Raise=True)
         try:
             otherId = ircdb.users.getUserId(hostmask)
-            if otherId != id:
+            if otherId != user.id:
                 irc.error('That hostmask is already registered.', Raise=True)
         except KeyError:
             pass
@@ -220,7 +220,7 @@ class User(callbacks.Privmsg):
         irc.replySuccess()
     addhostmask = wrap(addhostmask, [first('otherUser', 'user'),
                                      optional('something'),
-                                     additional('something')])
+                                     additional('something', '')])
 
     def removehostmask(self, irc, msg, args, user, hostmask, password):
         """<name> <hostmask> [<password>]
@@ -250,7 +250,7 @@ class User(callbacks.Privmsg):
         ircdb.users.setUser(user)
         irc.replySuccess(s)
     removehostmask = wrap(removehostmask, ['private', 'otherUser', 'something',
-                                           additional('something')])
+                                           additional('something', '')])
 
     def setpassword(self, irc, msg, args, optlist, user, password,newpassword):
         """[--hashed] <name> <old password> <new password>