--- parser3/src/classes/string.C	2013/10/17 21:52:32	1.211
+++ parser3/src/classes/string.C	2015/04/02 22:18:25	1.213
@@ -20,7 +20,7 @@
 #include "pa_vregex.h"
 #include "pa_charsets.h"
 
-volatile const char * IDENT_STRING_C="$Id: string.C,v 1.211 2013/10/17 21:52:32 moko Exp $";
+volatile const char * IDENT_STRING_C="$Id: string.C,v 1.213 2015/04/02 22:18:25 moko Exp $";
 
 // class
 
@@ -689,7 +689,7 @@ static void _trim(Request& r, MethodPara
 			else
 				throw Exception(PARSER_RUNTIME,
 					&skind,
-					"'kind' must be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION);
+					"'kind' must be one of " TRIM_START_OPTION ", " TRIM_BOTH_OPTION ", " TRIM_END_OPTION);
 
 		if(params_count>1) {
 			const String& schars=params.as_string(1, "'chars' must be string");
@@ -748,7 +748,7 @@ static void _escape(Request& r, MethodPa
 static void _unescape(Request& r, MethodParams& params){
 	const String& src=params.as_string(0, PARAMETER_MUST_BE_STRING);
 	if(const char* result=unescape_chars(src.cstr(), src.length(), &r.charsets.source(), true))
-		r.write_assign_lang(*new String(result));
+		r.write_assign_lang(*new String(result, String::L_TAINTED));
 }
 
 // constructor