From a29a225724121eddbb32ddc9aad484e83361cc18 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 30 Mar 2007 11:27:19 +0000
Subject: Fixed #500

---
 HISTORY                                              | 1 +
 framework/Web/UI/ActiveControls/TActiveHyperLink.php | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY b/HISTORY
index c4d90349..a980fcd1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,7 @@ Version 3.1.0 beta to be released
 =================================
 BUG: Ticket#278 - client-side validator enable/disable (conditional) (Wei)
 BUG: Ticket#492 - TDataGridPagerStyle not found error (Qiang)
+BUG: Ticket#500 - URL encode in callback (Wei)
 BUG: Ticket#517 - Quickstart I18N sample: conflicting module ID (Wei)
 BUG: Ticket#521 - comment tag on TActiveButton stop callback (Wei)
 BUG: Ticket#526 - TDatePicker Mode="Button" with ActivePanel Enabled="false" (Wei)
diff --git a/framework/Web/UI/ActiveControls/TActiveHyperLink.php b/framework/Web/UI/ActiveControls/TActiveHyperLink.php
index 44638759..e92c1b19 100644
--- a/framework/Web/UI/ActiveControls/TActiveHyperLink.php
+++ b/framework/Web/UI/ActiveControls/TActiveHyperLink.php
@@ -81,7 +81,10 @@ class TActiveHyperLink extends THyperLink implements IActiveControl
 	{
 		parent::setNavigateUrl($value);
 		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->setAttribute($this, 'href', $value);
+		{
+			$url = str_replace('&amp;', '&', $value); //for placing url, we need to strip out the &amp;
+			$this->getPage()->getCallbackClient()->setAttribute($this, 'href', $url);
+		}
 	}
 
 	/**
-- 
cgit v1.2.3