Merge branch 'master' of dhx.github:DHTMLX/connector-php

Conflicts:
	codebase/base_connector.php

1 files changed, 14 insertions, 9 deletions

diff --git a/codebase/update.php b/codebase/update.php
index aa98270..4e73e93 100755
--- a/codebase/update.php
+++ b/codebase/update.php
@@ -104,12 +104,13 @@ class DataUpdate{
 	

 	protected $table; //!< table , where actions are stored

 	protected $url; //!< url for notification service, optional

-    protected $sql; //!< DB wrapper object

-    protected $config; //!< DBConfig object

-    protected $request; //!< DBRequestConfig object

-    protected $event;

-    protected $item_class;

-    protected $demu;

+	protected $sql; //!< DB wrapper object

+	protected $config; //!< DBConfig object

+	protected $request; //!< DBRequestConfig object

+	protected $encoding="utf-8";

+	protected $event;

+	protected $item_class;

+	protected $demu;

 	

 	//protected $config;//!< DataConfig instance

 	//protected $request;//!< DataRequestConfig instance

@@ -141,6 +142,10 @@ class DataUpdate{
         $this->event = $master;

         $this->item_class = $name;

     }

+

+    public function set_encoding($encoding){

+        $this->encoding = $encoding;

+    }

    	

 	protected function select_update($actions_table, $join_table, $id_field_name, $version, $user) {

 

@@ -222,8 +227,8 @@ class DataUpdate{
 		$output = $this->render_set($this->sql->select($sub_request), $this->item_class);

         

 		ob_clean();

-		header("Content-type:text/xml");

-        

+		header("Content-type:text/xml; charset=".$this->encoding);

+

 		echo $this->updates_start();

 		echo $this->get_version();

 		echo $output;

@@ -346,4 +351,4 @@ class JSONDataUpdate extends DataUpdate {
 

 }

 	

-?>
\ No newline at end of file
+?>