summaryrefslogtreecommitdiffstats
path: root/codebase/scheduler_connector.php
diff options
context:
space:
mode:
authorDmitry <dmitry@dhtmlx.com>2012-07-12 13:31:01 +0200
committerDmitry <dmitry@dhtmlx.com>2012-07-12 13:31:01 +0200
commit292bdb8b3b444dc480c6039a3b7acd0d5f60aa2a (patch)
tree5cb0efb2bb6518766294dd55394f448249921eb9 /codebase/scheduler_connector.php
parent2bc0d779055d2d3f31ba1dfcaec6777ab22d2c82 (diff)
downloadconnector-php-292bdb8b3b444dc480c6039a3b7acd0d5f60aa2a.zip
connector-php-292bdb8b3b444dc480c6039a3b7acd0d5f60aa2a.tar.gz
connector-php-292bdb8b3b444dc480c6039a3b7acd0d5f60aa2a.tar.bz2
implement complex mix using
Diffstat (limited to 'codebase/scheduler_connector.php')
-rw-r--r--codebase/scheduler_connector.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/codebase/scheduler_connector.php b/codebase/scheduler_connector.php
index 8ebe875..e2a9773 100644
--- a/codebase/scheduler_connector.php
+++ b/codebase/scheduler_connector.php
@@ -213,9 +213,10 @@ class JSONSchedulerConnector extends SchedulerConnector {
DB resultset
*/
protected function output_as_xml($res){
- $data=$this->xml_start();
- $data.=$this->render_set($res);
- $data.=$this->xml_end();
+ $result = $this->render_set($res);
+ if ($this->simple) return $result;
+
+ $data=$this->xml_start().json_encode($result).$this->xml_end();
if ($this->as_string) return $data;