3 files changed, 4 insertions, 4 deletions

diff --git a/framework/Web/UI/WebControls/TButton.php b/framework/Web/UI/WebControls/TButton.php
index 4eb8e093..6c423d84 100644
--- a/framework/Web/UI/WebControls/TButton.php
+++ b/framework/Web/UI/WebControls/TButton.php
@@ -78,7 +78,7 @@ class TButton extends TWebControl implements IPostBackEventHandler
 			$onclick=$this->getOnClientClick();

 			if($onclick!=='')

 				$onclick=rtrim($onclick,';').';';

-			$onclick.=$page->getClientScript()->getPostBackEventReference($this->getPostBackOptions());

+			$onclick.=$page->getClientScript()->getPostBackEventReference($this,'',$this->getPostBackOptions(),false);

 		}

 		else if($this->getEnabled())   // in this case, parent will not render 'disabled'

 			$writer->addAttribute('disabled','disabled');

diff --git a/framework/Web/UI/WebControls/TCheckBox.php b/framework/Web/UI/WebControls/TCheckBox.php
index 756fb2ea..7b9d4702 100644
--- a/framework/Web/UI/WebControls/TCheckBox.php
+++ b/framework/Web/UI/WebControls/TCheckBox.php
@@ -381,10 +381,10 @@ class TCheckBox extends TWebControl implements IPostBackDataHandler, IValidatabl
 				$option->AutoPostBack=true;

 			if(!empty($onclick))

 				$onclick=rtrim($onclick,';').';';

-			$onclick.=$page->getClientScript()->getPostBackEventReference($option);

+			$onclick.=$page->getClientScript()->getPostBackEventReference($this,'',$option,false);

 		}

 		if(!empty($onclick))

-			$writer->addAttribute('onclick',$onclick);

+			$writer->addAttribute('onclick','javascript:'.$onclick);

 		if(($accesskey=$this->getAccessKey())!=='')

 			$writer->addAttribute('accesskey',$accesskey);

 		if(($tabindex=$this->getTabIndex())>0)

diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php
index d715480d..b0fb5a8b 100644
--- a/framework/Web/UI/WebControls/TImageButton.php
+++ b/framework/Web/UI/WebControls/TImageButton.php
@@ -74,7 +74,7 @@ class TImageButton extends TImage implements IPostBackDataHandler, IPostBackEven
 			$onclick=$this->getOnClientClick();

 			if($onclick!=='')

 				$onclick=rtrim($onclick,';').';';

-			$onclick.=$page->getClientScript()->getPostBackEventReference($this->getPostBackOptions());

+			$onclick.=$page->getClientScript()->getPostBackEventReference($this,'',$this->getPostBackOptions(),false);

 		}

 		else if($this->getEnabled())   // in this case, parent will not render 'disabled'

 			$writer->addAttribute('disabled','disabled');