aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
diff options
context:
space:
mode:
authorSpp- <u84280@epreinf21.(none)>2011-06-30 14:52:44 +0200
committerSpp- <u84280@epreinf21.(none)>2011-06-30 14:52:44 +0200
commite9aa72cc7b09999a1cbb6df994396ae8823657f6 (patch)
treec7744520221f53ecd5605b153bf10917e2877850 /src/server/scripts/Commands
parent6fd41ae50e5f988473f86ad8370b60a1e29eac5f (diff)
Cosmetic: rename function escape_string to EscapeString
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_go.cpp2
-rw-r--r--src/server/scripts/Commands/cs_gobject.cpp2
-rw-r--r--src/server/scripts/Commands/cs_wp.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 7129aa67c99..8393d338e93 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -113,7 +113,7 @@ public:
if (!guid)
{
std::string name = pParam1;
- WorldDatabase.escape_string(name);
+ WorldDatabase.EscapeString(name);
whereClause << ", creature_template WHERE creature.id = creature_template.entry AND creature_template.name "_LIKE_" '" << name << "'";
}
else
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index 3197595812f..204012224d5 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -233,7 +233,7 @@ public:
else
{
std::string name = cId;
- WorldDatabase.escape_string(name);
+ WorldDatabase.EscapeString(name);
result = WorldDatabase.PQuery(
"SELECT guid, id, position_x, position_y, position_z, orientation, map, phaseMask, (POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ "
"FROM gameobject, gameobject_template WHERE gameobject_template.entry = gameobject.id AND map = %i AND name "_LIKE_" "_CONCAT3_("'%%'", "'%s'", "'%%'")" ORDER BY order_ ASC LIMIT 1",
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index 4addf788183..1da11795742 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -434,7 +434,7 @@ public:
else
{
std::string arg_str_3 = arg_3;
- WorldDatabase.escape_string(arg_str_3);
+ WorldDatabase.EscapeString(arg_str_3);
WorldDatabase.PExecute("UPDATE waypoint_scripts SET %s='%s' WHERE guid='%u'",
arg_2, arg_str_3.c_str(), id);
}
@@ -619,7 +619,7 @@ public:
{
// show_str check for present in list of correct values, no sql injection possible
std::string text2 = text;
- WorldDatabase.escape_string(text2);
+ WorldDatabase.EscapeString(text2);
WorldDatabase.PExecute("UPDATE waypoint_data SET %s='%s' WHERE id='%u' AND point='%u'",
show_str, text2.c_str(), pathid, point);
}