--- parser3/src/classes/xdoc.C	2016/09/21 15:35:10	1.188
+++ parser3/src/classes/xdoc.C	2016/11/01 23:10:41	1.190
@@ -28,7 +28,7 @@
 #include "xnode.h"
 #include "pa_charsets.h"
 
-volatile const char * IDENT_XDOC_C="$Id: xdoc.C,v 1.188 2016/09/21 15:35:10 moko Exp $";
+volatile const char * IDENT_XDOC_C="$Id: xdoc.C,v 1.190 2016/11/01 23:10:41 moko Exp $";
 
 // defines
 
@@ -160,7 +160,7 @@ static void writeNode(Request& r, VXdoc&
 			"error creating node"); // OOM, bad name, things like that
 
 	// write out result
-	r.write_no_lang(xdoc.wrap(*node));
+	r.write(xdoc.wrap(*node));
 }
 
 struct IdsIteratorInfo {
@@ -379,10 +379,10 @@ static void _create(Request& r, MethodPa
 	xmlDoc* xmldoc;
 	bool set_encoding=false;
 	if(param.get_junction()) { // {<?xml?>...}
-		Temp_lang temp_lang(r, String::L_XML);
+
 		const String& xml=r.process_to_string(param);
+		String::Body sbody=xml.cstr_to_string_body_untaint(String::L_XML, r.connection(false), &r.charsets);
 
-		String::Body sbody=xml.cstr_to_string_body_untaint(r.flang, r.connection(false), &r.charsets);
 		xmldoc=xmlParseMemory(sbody.cstr(), sbody.length());
 
 		//printf("document=0x%p\n", document);
@@ -571,7 +571,7 @@ static void _file(Request& r, MethodPara
 	vfile.set_binary(false/*not tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, oo.filename, &vhcontent_type);
 
 	// write out result
-	r.write_no_lang(vfile);
+	r.write(vfile);
 }
 
 static void _save(Request& r, MethodParams& params) {
@@ -594,7 +594,7 @@ static void _string(Request& r, MethodPa
 		true/*use source charset to render, client charset to put to header*/);
 
 	// write out result
-	r.write_no_lang(String(buf, String::L_AS_IS));
+	r.write(String(buf, String::L_AS_IS));
 }
 
 #ifndef DOXYGEN
@@ -717,7 +717,7 @@ static void _transform(Request& r, Metho
 	}
 
 	// write out result
-	r.write_no_lang(*result);
+	r.write(*result);
 }
 
 // constructor