summaryrefslogtreecommitdiff
path: root/src/misc.cpp
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-06-20 23:28:25 -0400
committerAdam <Adam@anope.org>2011-06-20 23:28:25 -0400
commit3be75cbcb309d61443b6dbfe05506aa73afdc402 (patch)
tree5cfa95a8f1bc9cddf441d108276df3c1d2a0b2f2 /src/misc.cpp
parent2667f9046ecd656f805d85397c27b8f19c864112 (diff)
parent26018713913475aaaaac60a527fb93df76ec45c7 (diff)
Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
Diffstat (limited to 'src/misc.cpp')
-rw-r--r--src/misc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/misc.cpp b/src/misc.cpp
index 73791a0cc..da07eaa28 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -416,7 +416,7 @@ bool isvalidchar(char c)
Anope::string myStrGetToken(const Anope::string &str, char dilim, int token_number)
{
if (str.empty() || str.find(dilim) == Anope::string::npos)
- return "";
+ return token_number ? "" : str;
Anope::string substring;
sepstream sep(str, dilim);
@@ -438,7 +438,7 @@ Anope::string myStrGetToken(const Anope::string &str, char dilim, int token_numb
Anope::string myStrGetTokenRemainder(const Anope::string &str, const char dilim, int token_number)
{
if (str.empty() || str.find(dilim) == Anope::string::npos)
- return "";
+ return token_number ? "" : str;
Anope::string substring;
sepstream sep(str, dilim);