merge from branch 3.0 till 908.

3 files changed, 11 insertions, 10 deletions

diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php
index e5e5f3b9..655b1df0 100644
--- a/framework/Web/UI/WebControls/TImageButton.php
+++ b/framework/Web/UI/WebControls/TImageButton.php
@@ -124,6 +124,7 @@ class TImageButton extends TImage implements IPostBackDataHandler, IPostBackEven
 		$options['ID'] = $this->getClientID();

 		$options['CausesValidation'] = $this->getCausesValidation();

 		$options['ValidationGroup'] = $this->getValidationGroup();

+		$options['EventTarget'] = $this->getUniqueID();

 

 		return $options;

 	}

diff --git a/framework/Web/UI/WebControls/TMultiView.php b/framework/Web/UI/WebControls/TMultiView.php
index 5f4f3d84..6dd0d8f1 100644
--- a/framework/Web/UI/WebControls/TMultiView.php
+++ b/framework/Web/UI/WebControls/TMultiView.php
@@ -248,6 +248,16 @@ class TMultiView extends TControl
 	}

 

 	/**

+	 * Loads state into the wizard.

+	 * This method is invoked by the framework when the control state is being saved.

+	 */

+	public function loadState()

+	{

+		// a dummy call to ensure the view is activated

+		$this->getActiveView();

+	}

+

+	/**

 	 * Renders the currently active view.

 	 * @param THtmlWriter the writer for the rendering purpose.

 	 */

diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 426fd73d..794fb4da 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -735,16 +735,6 @@ class TWizard extends TWebControl implements INamingContainer
 	}

 

 	/**

-	 * Loads state into the wizard.

-	 * This method is invoked by the framework when the control state is being saved.

-	 */

-	public function loadState()

-	{

-		// a dummy call to ensure the step is activated

-		$this->getActiveStep();

-	}

-

-	/**

 	 * Indicates the wizard needs to recreate all child controls.

 	 */

 	protected function requiresControlsRecreation()