diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 15:34:28 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 15:34:28 +0100 |
| commit | c70c6d19c1cabf46b595591802bceab63d371788 (patch) | |
| tree | 1c153d2bfe560171bad5889d528dc5cf110e8533 /src/utils/stringfilter.cpp | |
| parent | d707495540581f8c1b9ab3d5007c9c4d1ab83b53 (diff) | |
| parent | 587b7682e6bf7dd9e616c1d4789a5ed9aa986e6d (diff) | |
| download | manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.gz manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.bz2 manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.xz manaserv-c70c6d19c1cabf46b595591802bceab63d371788.zip | |
Merge branch 'master' into lpc2012
Conflicts:
gameserver.cbp
src/account-server/accounthandler.cpp
src/game-server/attack.cpp
src/game-server/attack.h
src/game-server/being.cpp
src/game-server/being.h
src/game-server/character.cpp
src/game-server/character.h
src/game-server/inventory.cpp
src/game-server/item.h
src/game-server/monster.cpp
src/game-server/monster.h
Diffstat (limited to 'src/utils/stringfilter.cpp')
| -rw-r--r-- | src/utils/stringfilter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/stringfilter.cpp b/src/utils/stringfilter.cpp index b48d267f..e3696097 100644 --- a/src/utils/stringfilter.cpp +++ b/src/utils/stringfilter.cpp @@ -100,8 +100,8 @@ bool StringFilter::filterContent(const std::string &text) const bool StringFilter::isEmailValid(const std::string &email) const { - unsigned int min = Configuration::getValue("account_minEmailLength", 7); - unsigned int max = Configuration::getValue("account_maxEmailLength", 128); + unsigned min = Configuration::getValue("account_minEmailLength", 7); + unsigned max = Configuration::getValue("account_maxEmailLength", 128); // Testing email validity if (email.length() < min || email.length() > max) |