Index: branches/RC/core/kernel/session/session.php
===================================================================
diff -u -N -r10372 -r10458
--- branches/RC/core/kernel/session/session.php	(.../session.php)	(revision 10372)
+++ branches/RC/core/kernel/session/session.php	(.../session.php)	(revision 10458)
@@ -739,8 +739,12 @@
 	}
 
 	/**
-	 * Returns SID from cookie
+	 * Returns SID from cookie.
 	 *
+	 * Use 2 cookies to have 2 expiration:
+	 * - 1. for normal expiration when browser is not closed (30 minutes by default), configurable
+	 * - 2. for advanced expiration when browser is closed
+	 *
 	 * @return int
 	 */
 	function GetSessionCookie()
Index: branches/RC/core/units/general/xml_helper.php
===================================================================
diff -u -N -r10446 -r10458
--- branches/RC/core/units/general/xml_helper.php	(.../xml_helper.php)	(revision 10446)
+++ branches/RC/core/units/general/xml_helper.php	(.../xml_helper.php)	(revision 10458)
@@ -18,7 +18,7 @@
 	 * @param string $xml
 	 * @return kXMLNode
 	 */
-	function &Parse($xml = null, $mode=XML_NO_TEXT_NODES)
+	function &Parse($xml = null, $mode = XML_NO_TEXT_NODES)
 	{
 		$this->Mode = $mode;
 		$this->Clear(); // in case if Parse method is called more then one time
@@ -76,7 +76,9 @@
 			$text_node->AppendData($Line);
 			$this->CurrentElement->AddChild( $text_node );
 		}
-		$this->CurrentElement->AppendData($Line);
+		else {
+			$this->CurrentElement->AppendData($Line);
+		}
 	}
 
 	function endElement($Parser, $Elem)
@@ -288,7 +290,9 @@
 		}
 		$xml .= $this->Data;
 		foreach ($this->Children as $node) {
-			$xml .= $node->GetXML();
+			/* @var $node kXMLNode */
+
+			$xml .= $node->GetXML($node->Name == '_TEXT_' ? true : false);
 		}
 
 		if (!$content_only) {