--- parser3/src/classes/table.C	2009/07/06 08:49:49	1.260
+++ parser3/src/classes/table.C	2009/08/08 13:30:20	1.264
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2009/07/06 08:49:49 $";
+static const char * const IDENT_TABLE_C="$Date: 2009/08/08 13:30:20 $";
 
 #if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 #include <sstream>
@@ -26,7 +26,7 @@ using namespace std;
 
 class MTable: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&, HashStringValue*) { return new VTable(); }
+	Value* create_new_value(Pool&) { return new VTable(); }
 
 public:
 	MTable();
@@ -39,10 +39,6 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(table, new MTable, 0);
 
-// externs
-
-extern String cycle_data_name;
-
 #define TABLE_REVERSE_NAME "reverse"
 
 // globals
@@ -611,8 +607,7 @@ static void _offset(Request& r, MethodPa
 }
 
 static void _menu(Request& r, MethodParams& params) {
-	Temp_hash_value<const String::Body, void*> 
-		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+	InCycle temp(r);
 
 	Value& body_code=params.as_junction(0, "body must be code");
 	
@@ -1094,7 +1089,7 @@ static void marshal_bind(
 {
 	SQL_Driver::Placeholder& ph=**pptr;
 	ph.name=aname.cstr();
-	ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);
+	ph.value=avalue->as_string().untaint_cstr(String::L_AS_IS);
 	ph.is_null=avalue->get_class()==void_class;
 	ph.were_updated=false;
 
@@ -1164,7 +1159,7 @@ static void _sql(Request& r, MethodParam
 
 	Temp_lang temp_lang(r, String::L_SQL);
 	const String&  statement_string=r.process_to_string(statement);
-	const char* statement_cstr=statement_string.cstr(String::L_UNSPECIFIED, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
 
 	Table_sql_event_handlers handlers;
 #ifdef RESOURCES_DEBUG