From 1c22314e5d19947bad8b987afbf2c9dc6bf834d6 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Mon, 4 Jun 2012 13:19:53 +0000
Subject: Related to r3159: Script rendering in ajax callbacks doesn't need to
 happen inside form rendering; avoid using assert(), throw an exception
 instead

---
 framework/Web/UI/TPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/Web/UI/TPage.php')

diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 9d9ac37e..c227562c 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -968,7 +968,7 @@ class TPage extends TTemplateControl
 	public function ensureRenderInForm($control)
 	{
 		if(!$this->getIsCallback() && !$this->_inFormRender)
-			throw new TConfigurationException('page_control_outofform',get_class($control),$control->getUniqueID());
+			throw new TConfigurationException('page_control_outofform',get_class($control), $control ? $control->getUniqueID() : null);
 	}
 
 	/**
-- 
cgit v1.2.3