diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 17:34:07 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 17:34:07 +0000 |
| commit | 44c4ff1750b519f16fc2830dc54bcb29adddd9b9 (patch) | |
| tree | 0f76016bec545164fe090257f931dbf8afdb8126 | |
| parent | 23425a017a8e0e6254c0a3e4ed6ca9de47523e76 (diff) | |
| download | hercules-44c4ff1750b519f16fc2830dc54bcb29adddd9b9.tar.gz hercules-44c4ff1750b519f16fc2830dc54bcb29adddd9b9.tar.bz2 hercules-44c4ff1750b519f16fc2830dc54bcb29adddd9b9.tar.xz hercules-44c4ff1750b519f16fc2830dc54bcb29adddd9b9.zip | |
* Merged changes up to eAthena 15090.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15929 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | doc/script_commands.txt | 6 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt index da23ff918..18dcb1291 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -6399,10 +6399,10 @@ to query the server log tables. --------------------------------------- -*escape_sql("<string>") +*escape_sql(<value>) -Escapes special characters in the string, so that it is safe to use in query_sql(), -and returns the escaped form of the given string. +Converts the value to a string and escapes special characters so that it is safe to use in query_sql(). +Returns the escaped form of the given value. Example 1: set .@str$, "John's Laptop"; diff --git a/src/map/script.c b/src/map/script.c index a2ffb54a0..fac58418d 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -16210,7 +16210,7 @@ struct script_function buildin_func[] = { BUILDIN_DEF(axtoi,"s"), BUILDIN_DEF(query_sql,"s*"), BUILDIN_DEF(query_logsql,"s*"), - BUILDIN_DEF(escape_sql,"s"), + BUILDIN_DEF(escape_sql,"v"), BUILDIN_DEF(atoi,"s"), // [zBuffer] List of player cont commands ---> BUILDIN_DEF(rid2name,"i"), |