From 247e58768c624174c649f9680a638fcbb8ecd0f0 Mon Sep 17 00:00:00 2001
From: tof <>
Date: Tue, 8 Apr 2008 15:52:53 +0000
Subject: Fixed #679

---
 HISTORY                                                   |  1 +
 framework/Web/UI/ActiveControls/TActiveControlAdapter.php | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HISTORY b/HISTORY
index ab69a842..36cb8c60 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ BUG: Ticket#595 - ControlCssClass not applied correctly if using multiple valida
 BUG: Ticket#636 - I18N catalogue problem (Christophe)
 BUG: Ticket#669 - Strange rendering behaviour with TActivePanel (Christophe)
 BUG: Ticket#671 - TActiveCustomValidator Callback Problem (Christophe)
+BUG: Ticket#679 - TActiveLabel can't be shown from inside TRepeater. TActiveRadioButton cant be unchecked (Christophe)
 BUG: Ticket#707 - TPropertyAccess sets property twice on object when using setters (Qiang)
 BUG: Ticket#719 - TAutoCompleter should not trigger Validation if CausesValidation=False (Christophe)
 BUG: Ticket#721 - TActiveCustomValidator + TValidationSummary problem (Christophe)
diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index 8e637719..f9979766 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -143,17 +143,16 @@ class TActiveControlAdapter extends TControlAdapter
 	}
 
 	/**
-	 * Loads additional persistent control state. Starts viewstate tracking
-	 * if necessary.
+	 * Starts viewstate tracking if necessary after when controls has been loaded
 	 */
-	public function loadState()
-	{
+	public function onLoad($param)
+	{
 		if($this->getIsTrackingPageState())
 		{
 			$this->_stateTracker = new TCallbackPageStateTracker($this->getControl());
 			$this->_stateTracker->trackChanges();
-		}
-		parent::loadState();
+		}
+		parent::onLoad($param);
 	}
 
 	/**
-- 
cgit v1.2.3