Committer 2nd part of patch for #391

2 files changed, 2 insertions, 2 deletions

diff --git a/framework/Web/UI/ActiveControls/TAutoComplete.php b/framework/Web/UI/ActiveControls/TAutoComplete.php
index cc63deae..2c160578 100644
--- a/framework/Web/UI/ActiveControls/TAutoComplete.php
+++ b/framework/Web/UI/ActiveControls/TAutoComplete.php
@@ -328,7 +328,7 @@ class TAutoComplete extends TActiveTextBox implements INamingContainer
 		{

 			$string = strtr($string,array('\t'=>"\t",'\n'=>"\n",'\r'=>"\r"));

 			$token = preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);

-			$options['tokens'] = TJavaScript::encode($token,false);

+			$options['tokens'] = $token;

 		}

 		if($this->getAutoPostBack())

 		{

diff --git a/framework/Web/UI/ActiveControls/TDropContainer.php b/framework/Web/UI/ActiveControls/TDropContainer.php
index e6933147..daa8469b 100755
--- a/framework/Web/UI/ActiveControls/TDropContainer.php
+++ b/framework/Web/UI/ActiveControls/TDropContainer.php
@@ -157,7 +157,7 @@ class TDropContainer extends TPanel implements IActiveControl, ICallbackEventHan
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
 
-		$options['accept'] = TJavascript::encode($this->getAcceptCssClass());
+		$options['accept'] = $this->getAcceptCssClass();
 		$options['hoverclass'] = $this->getHoverCssClass();
 		return $options;
 	}