--- parser3/src/classes/void.C	2012/03/16 09:24:08	1.50
+++ parser3/src/classes/void.C	2019/09/06 10:17:07	1.56
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b VOID parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -12,11 +12,7 @@
 #include "pa_vvoid.h"
 #include "pa_sql_connection.h"
 
-volatile const char * IDENT_VOID_C="$Id: void.C,v 1.50 2012/03/16 09:24:08 moko Exp $";
-
-// externs
-
-extern String sql_bind_name;
+volatile const char * IDENT_VOID_C="$Id: void.C,v 1.56 2019/09/06 10:17:07 moko Exp $";
 
 // class
 
@@ -56,7 +52,7 @@ static void _sql(Request& r, MethodParam
 
 	HashStringValue* bind=0;
 	if(params.count()>1)
-		if(HashStringValue* options=params.as_hash(1)) {
+		if(HashStringValue* options=params.as_hash(1, "sql options")) {
 			int valid_options=0;
 			if(Value* vbind=options->get(sql_bind_name)) {
 				valid_options++;
@@ -71,9 +67,8 @@ static void _sql(Request& r, MethodParam
 	if(bind)
 		placeholders_count=marshal_binds(*bind, placeholders);
 
-	Temp_lang temp_lang(r, String::L_SQL);
 	const String& statement_string=r.process_to_string(statement);
-	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());
 
 	Void_sql_event_handlers handlers(statement_string);
 	r.connection()->query(
@@ -89,7 +84,9 @@ static void _sql(Request& r, MethodParam
 
 // constructor
 
-MVoid::MVoid(): Methoded("void", string_class) {
+MVoid::MVoid(): Methoded("void") {
+	set_base(string_class);
+
 	// ^void:sql{query}
 	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);