Fixed TConditional expression context.

1 files changed, 3 insertions, 1 deletions

diff --git a/framework/Web/UI/WebControls/TConditional.php b/framework/Web/UI/WebControls/TConditional.php
index 70eedf6d..41535ca4 100644
--- a/framework/Web/UI/WebControls/TConditional.php
+++ b/framework/Web/UI/WebControls/TConditional.php
@@ -74,7 +74,7 @@ class TConditional extends TControl
 		$result=true;

 		try

 		{

-			$result=$this->evaluateExpression($this->_condition);

+			$result=$this->getTemplateControl()->evaluateExpression($this->_condition);

 		}

 		catch(Exception $e)

 		{

@@ -99,6 +99,8 @@ class TConditional extends TControl
 	}

 

 	/**

+	 * Sets the PHP expression to be evaluated for conditionally displaying content.

+	 * The context of the expression is the template control containing TConditional.

 	 * @param string the PHP expression used for determining which template to use.

 	 */

 	public function setCondition($value)