Reduce User* -> Membership* lookups on part and kick

[user/henk/code/inspircd.git] / src / commands / cmd_version.cpp

diff --git a/src/commands/cmd_version.cpp b/src/commands/cmd_version.cpp
index 9b19c0ee06c2cca53d42122a26a56b6b4d9b9e23..9fdd9c838d0d9a1c694d2c7f43e54c6b9a57f38d 100644 (file)
--- a/src/commands/cmd_version.cpp
+++ b/src/commands/cmd_version.cpp
@@ -20,14 +20,6 @@
 
 #include "inspircd.h"
 
-#ifndef CMD_VERSION_H
-#define CMD_VERSION_H
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /VERSION. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -48,15 +40,15 @@ class CommandVersion : public Command
        CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
-
-
 CmdResult CommandVersion::Handle (const std::vector<std::string>&, User *user)
 {
-       user->WriteNumeric(RPL_VERSION, "%s :%s",user->nick.c_str(),ServerInstance->GetVersionString(IS_OPER(user)).c_str());
-       ServerInstance->Config->Send005(user);
+       std::string version = ServerInstance->GetVersionString((user->IsOper()));
+       user->WriteNumeric(RPL_VERSION, "%s :%s", user->nick.c_str(), version.c_str());
+       LocalUser *lu = IS_LOCAL(user);
+       if (lu != NULL)
+       {
+               ServerInstance->ISupport.SendTo(lu);
+       }
        return CMD_SUCCESS;
 }