Merge pull request #1139 from johanna-a/master

[user/henk/code/inspircd.git] / src / coremods / core_who.cpp

diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp
index ba67d0700034dc10bd999a309d5c633b54f7f315..8b9258d71d374160f2bbb8a3e792a93697436ad6 100644 (file)
--- a/src/coremods/core_who.cpp
+++ b/src/coremods/core_who.cpp
@@ -42,7 +42,7 @@ class CommandWho : public Command
 
        Membership* get_first_visible_channel(User* u)
        {
-               for (UCListIter i = u->chans.begin(); i != u->chans.end(); ++i)
+               for (User::ChanList::iterator i = u->chans.begin(); i != u->chans.end(); ++i)
                {
                        Membership* memb = *i;
                        if (!memb->chan->IsModeSet(secretmode))
@@ -144,7 +144,7 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
                        long seconds = InspIRCd::Duration(matchtext);
 
                        // Okay, so time matching, we want all users connected `seconds' ago
-                       if (user->age >= ServerInstance->Time() - seconds)
+                       if (user->signon >= ServerInstance->Time() - seconds)
                                match = true;
                }
 
@@ -171,9 +171,6 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
 
 bool CommandWho::CanView(Channel* chan, User* user)
 {
-       if (!user || !chan)
-               return false;
-
        /* Bug #383 - moved higher up the list, because if we are in the channel
         * we can see all its users
         */