--- parser3/src/classes/hash.C	2016/10/06 19:41:36	1.134
+++ parser3/src/classes/hash.C	2016/10/26 15:44:49	1.136
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.134 2016/10/06 19:41:36 moko Exp $";
+volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.136 2016/10/26 15:44:49 moko Exp $";
 
 // class
 
@@ -332,9 +332,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());
 
 	HashStringValue& hash=GET_SELF(r, VHashBase).hash();
 	hash.clear();	
@@ -591,15 +590,15 @@ static void _at(Request& r, MethodParams
 				{
 #ifdef HASH_ORDER
 					if(pos == 0) {
-						r.write_assign_lang(*new VString(*new String(hash.first_key(), String::L_TAINTED)));
+						r.write_pass_lang(*new VString(*new String(hash.first_key(), String::L_TAINTED)));
 					} else if((size_t)pos == count-1) {
-						r.write_assign_lang(*new VString(*new String(hash.last_key(), String::L_TAINTED)));
+						r.write_pass_lang(*new VString(*new String(hash.last_key(), String::L_TAINTED)));
 					} else
 #endif
 					{
 						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
 							if(!pos){
-								r.write_assign_lang(*new VString(*new String(i.key(), String::L_TAINTED)));
+								r.write_pass_lang(*new VString(*new String(i.key(), String::L_TAINTED)));
 								break;
 							}
 					}
@@ -609,15 +608,15 @@ static void _at(Request& r, MethodParams
 				{
 #ifdef HASH_ORDER
 					if(pos == 0) {
-						r.write_assign_lang(*hash.first_value());
+						r.write_pass_lang(*hash.first_value());
 					} else if((size_t)pos == count-1) {
-						r.write_assign_lang(*hash.last_value());
+						r.write_pass_lang(*hash.last_value());
 					} else
 #endif
 					{
 						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
 							if(!pos){
-								r.write_assign_lang(*i.value());
+								r.write_pass_lang(*i.value());
 								break;
 							}
 					}