Merge remote-tracking branch 'origin/master'

Stanislav-Wolski · Stanislav-Wolski · commit 03c20c434737 · 2015-06-16T15:48:13.000+03:00
Conflicts:
	codebase/combo_connector.php
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
 	*/

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function select(){`
`25`	`25`	`function to_xml_start(){`
`26`	`26`	`if ($this->skip) return "";`
`27`	`27`
`28`		`- return "<option ".($this->selected?"selected='true'":"")."value='".$this->xmlentities($this->get_id())."'><![CDATA[".$this->data[$this->config->text[0]["name"]]."]]>";`
	`28`	`+ return "<option ".($this->selected?"selected='true' ":"")."value='".$this->xmlentities($this->get_id())."'><![CDATA[".$this->data[$this->config->text[0]["name"]]."]]>";`
`29`	`29`	`}`
`30`	`30`	`/*! return self as XML string, ending part`
`31`	`31`	`*/`