diff options
| author | Stanislau Wolski <stanislau.wolski@gmail.com> | 2014-08-08 15:10:22 +0300 |
|---|---|---|
| committer | Stanislau Wolski <stanislau.wolski@gmail.com> | 2014-08-08 15:10:22 +0300 |
| commit | c1a155bd754eb89137a45056e2ef9b1d13b2501c (patch) | |
| tree | 7bb1059372d35f8b7d0708a6575c05c26f1d0307 /codebase | |
| parent | d2fe288e9e33406bafb6d77fa1c122d29edd3d4d (diff) | |
| parent | 4fc1e6da2aaf2e9c47c31b2b4d247c3ed99dc9d2 (diff) | |
| download | connector-php-c1a155bd754eb89137a45056e2ef9b1d13b2501c.zip connector-php-c1a155bd754eb89137a45056e2ef9b1d13b2501c.tar.gz connector-php-c1a155bd754eb89137a45056e2ef9b1d13b2501c.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'codebase')
| -rw-r--r-- | codebase/grid_connector.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/codebase/grid_connector.php b/codebase/grid_connector.php index 10a98bd..d9be16a 100644 --- a/codebase/grid_connector.php +++ b/codebase/grid_connector.php @@ -94,13 +94,20 @@ class GridDataItem extends DataItem{ for ($i=0; $i < sizeof($this->config->text); $i++){ $str.="<cell"; $name=$this->config->text[$i]["name"]; + $xmlcontent = false; if (isset($this->cell_attrs[$name])){ $cattrs=$this->cell_attrs[$name]; - foreach ($cattrs as $k => $v) + foreach ($cattrs as $k => $v){ $str.=" ".$k."='".$this->xmlentities($v)."'"; + if ($k == "xmlcontent") + $xmlcontent = true; + } } $value = isset($this->data[$name]) ? $this->data[$name] : ''; - $str.="><![CDATA[".$value."]]></cell>"; + if (!$xmlcontent) + $str.="><![CDATA[".$value."]]></cell>"; + else + $str.=">".$value."</cell>"; } if ($this->userdata !== false) foreach ($this->userdata as $key => $value) |