Merge remote-tracking branch 'origin/master'

Conflicts: codebase/combo_connector.php
DHTMLX · Jun 16, 2015 · 03c20c4 · 03c20c4
2 parents 21af050 + 074750e
commit 03c20c4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/codebase/combo_connector.php b/codebase/combo_connector.php
@@ -25,7 +25,7 @@ function select(){
 	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
 	*/