diff options
author | Stanislau Wolski <stanislau.wolski@gmail.com> | 2015-06-16 15:48:13 +0300 |
---|---|---|
committer | Stanislau Wolski <stanislau.wolski@gmail.com> | 2015-06-16 15:48:13 +0300 |
commit | 03c20c4347378e3279c46c8ecf105c771511c6b4 (patch) | |
tree | 54d2303093a6bf82c6094748855a11f2c54f9b9e /codebase | |
parent | 21af0503ad129c8cd83ec355638e7aa029c42af6 (diff) | |
parent | 074750e6ee632990c5b9334473df0f8b4b65c000 (diff) | |
download | connector-php-03c20c4347378e3279c46c8ecf105c771511c6b4.zip connector-php-03c20c4347378e3279c46c8ecf105c771511c6b4.tar.gz connector-php-03c20c4347378e3279c46c8ecf105c771511c6b4.tar.bz2 |
Merge remote-tracking branch 'origin/master'2.2.0
Conflicts:
codebase/combo_connector.php
Diffstat (limited to 'codebase')
-rw-r--r-- | codebase/combo_connector.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/codebase/combo_connector.php b/codebase/combo_connector.php index 8fb5416..0e2fb85 100644 --- a/codebase/combo_connector.php +++ b/codebase/combo_connector.php @@ -25,7 +25,7 @@ class ComboDataItem extends DataItem{ function to_xml_start(){ if ($this->skip) return ""; - return "<option ".($this->selected?"selected='true'":"")."value='".$this->xmlentities($this->get_id())."'><![CDATA[".$this->data[$this->config->text[0]["name"]]."]]>"; + return "<option ".($this->selected?"selected='true' ":"")."value='".$this->xmlentities($this->get_id())."'><![CDATA[".$this->data[$this->config->text[0]["name"]]."]]>"; } /*! return self as XML string, ending part */ |