X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=fb6783d8b0b4ddbd5575da9a3f061838672b50fa;hb=8be88f3e732e7a40f2e501c5e5b78c7f1b999f2d;hp=0c627482aeb47260deb3e66c6852b08a8f8ed9f4;hpb=6cfc9625c0068d1a2d67fb9d08a1670a6f2358e4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 0c627482a..fb6783d8b 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -241,15 +241,12 @@ class ModuleAlias : public Module
 		while (*(compare.c_str()) == ' ')
 			compare.erase(compare.begin());
 
-		std::string safe(compare);
-
-		ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: compare is %s and safe is %s", compare.c_str(), safe.c_str());
-
 		while (i != upperbound)
 		{
 			if (i->second.ChannelCommand)
 			{
-				if (DoAlias(user, c, &(i->second), compare, safe))
+				// We use substr(1) here to remove the fantasy prefix
+				if (DoAlias(user, c, &(i->second), compare, text.substr(1)))
 					return 0;
 			}
 
@@ -366,7 +363,7 @@ class ModuleAlias : public Module
 		else
 		{
 			/* We don't want these in a user alias */
-			SearchAndReplace(newline, std::string("$chan"), "");
+			SearchAndReplace(newline, std::string("$chan"), std::string(""));
 		}
 
 		irc::tokenstream ss(newline);
@@ -381,7 +378,7 @@ class ModuleAlias : public Module
 		ServerInstance->Parser->CallHandler(command, pars, user);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ReadAliases();
  	}