Defer render() calls in callback event handler to a later stage.

1 files changed, 13 insertions, 3 deletions

diff --git a/framework/Web/UI/ActiveControls/TActivePanel.php b/framework/Web/UI/ActiveControls/TActivePanel.php
index 44f570b3..6f5c87dd 100644
--- a/framework/Web/UI/ActiveControls/TActivePanel.php
+++ b/framework/Web/UI/ActiveControls/TActivePanel.php
@@ -59,13 +59,23 @@ class TActivePanel extends TPanel implements IActiveControl
 

 	/**

 	 * Renders and replaces the panel's content on the client-side.

+	 * When render() is called before the OnPreRender event, such as when render()

+	 * is called during a callback event handler, the rendering

+	 * is defered until OnPreRender event is raised.

 	 * @param THtmlWriter html writer

 	 */

 	public function render($writer)

 	{

-		parent::render($writer);

-		if($this->getActiveControl()->canUpdateClientSide())

-			$this->getPage()->getCallbackClient()->replaceContent($this,$writer);

+		if($this->getHasPreRendered())

+		{

+			parent::render($writer);

+			if($this->getActiveControl()->canUpdateClientSide())

+				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);

+		}

+		else

+		{

+			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);

+		}

 	}

 }