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

Stanislav-Wolski · Stanislav-Wolski · commit dc85c3fd5981 · 2016-05-30T19:03:45.000+03:00
Conflicts:
	codebase/base_connector.php
diff --git a/codebase/base_connector.php b/codebase/base_connector.php
@@ -700,6 +700,9 @@ protected function end_run(){
 	*/
 	public function set_encoding($encoding){
 		$this->encoding=$encoding;
+		if ($this->live_update !== false) {
+			$this->live_update->set_encoding($this->encoding);
+		}
 	}
 
 	/*! enable or disable dynamic loading mode
@@ -857,6 +860,7 @@ public function update($data) {
 	public function enable_live_update($table, $url=false, $origin_table = false){
         $this->live_update = new $this->live_update_data_type($this->sql, $this->config, $this->request, $table,$url, array("connector" => $this, "table" => $origin_table));
         $this->live_update->set_event($this->event,$this->names["item_class"]);
+		$this->live_update->set_encoding($this->encoding);
 		$this->event->attach("beforeOutput", 		Array($this->live_update, "version_output"));
 		$this->event->attach("beforeFiltering", 	Array($this->live_update, "get_updates"));
 		$this->event->attach("beforeProcessing", 	Array($this->live_update, "check_collision"));
diff --git 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 @@ public function set_event($master, $name){
         $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 @@ public function get_updates() {
 		$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 @@ protected function output($res){
 
 }
 	
-?>
+?>
