summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislau Wolski <stanislau.wolski@gmail.com>2014-04-18 13:31:39 +0300
committerStanislau Wolski <stanislau.wolski@gmail.com>2014-04-18 13:31:39 +0300
commitd5aff0e2d4ff69ba048957820a25cb4810db2e52 (patch)
tree632f1de536858e6c10660515d71c2f862e13e4ea
parent1eb0d049180342db92bed2c1acaa9f6d7a76cca9 (diff)
parent7e6e32afb6dea0f49bcfc77a5fc9b156501c25f4 (diff)
downloadconnector-php-d5aff0e2d4ff69ba048957820a25cb4810db2e52.zip
connector-php-d5aff0e2d4ff69ba048957820a25cb4810db2e52.tar.gz
connector-php-d5aff0e2d4ff69ba048957820a25cb4810db2e52.tar.bz2
Merge branch 'master' of github.com:DHTMLX/connector-php
-rw-r--r--codebase/data_connector.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/codebase/data_connector.php b/codebase/data_connector.php
index 99ec843..c7b33bd 100644
--- a/codebase/data_connector.php
+++ b/codebase/data_connector.php
@@ -277,6 +277,8 @@ class JSONCommonDataItem extends DataItem{
for ($i=0; $i<sizeof($this->config->text); $i++){
$extra = $this->config->text[$i]["name"];
$data[$extra]=$this->data[$extra];
+ if (is_null($data[$extra]))
+ $data[$extra] = "";
}
if ($this->userdata !== false)
@@ -523,4 +525,4 @@ class JSONTreeCommonDataItem extends TreeCommonDataItem{
}
-?> \ No newline at end of file
+?>