From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 framework/Web/UI/ActiveControls/TBaseActiveControl.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'framework/Web/UI/ActiveControls/TBaseActiveControl.php')

diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
index 4ede6ff6..8f55e27b 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.UI.ActiveControls
@@ -385,8 +385,7 @@ class TBaseActiveCallbackControl extends TBaseActiveControl
 	 */
 	public function getJsCallbackOptions()
 	{
-		return TJavascript::encode($this->getClientSideOptions());
+		return TJavaScript::encode($this->getClientSideOptions());
 	}
 }
 
-?>
-- 
cgit v1.2.3