From 5aff249d0b574f90f527b7af60604439f8fa3bef Mon Sep 17 00:00:00 2001 From: javalizard <> Date: Sun, 18 Apr 2010 03:15:01 +0000 Subject: ensured that the WebControls are calling their parent __construct methods --- framework/Web/UI/WebControls/TWizard.php | 33 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'framework/Web/UI/WebControls/TWizard.php') diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php index 774096f7..428b4c80 100644 --- a/framework/Web/UI/WebControls/TWizard.php +++ b/framework/Web/UI/WebControls/TWizard.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -1391,21 +1391,21 @@ class TWizard extends TWebControl implements INamingContainer else if(strcasecmp($command,self::CMD_MOVETO)===0) { if($this->_cancelNavigation) // may be set in onSideBarButtonClick - $navParam->setCancelNavigation(true); - $requestedStep=$param->getCommandParameter(); - if (!is_numeric($requestedStep)) - { - $requestedIndex=-1; - foreach ($this->getWizardSteps() as $index=>$step) - if ($step->getId()===$requestedStep) - { - $requestedIndex=$index; - break; - } - if ($requestedIndex<0) - throw new TConfigurationException('wizard_step_invalid'); - } - else + $navParam->setCancelNavigation(true); + $requestedStep=$param->getCommandParameter(); + if (!is_numeric($requestedStep)) + { + $requestedIndex=-1; + foreach ($this->getWizardSteps() as $index=>$step) + if ($step->getId()===$requestedStep) + { + $requestedIndex=$index; + break; + } + if ($requestedIndex<0) + throw new TConfigurationException('wizard_step_invalid'); + } + else $requestedIndex=TPropertyValue::ensureInteger($requestedStep); $navParam->setNextStepIndex($requestedIndex); $handled=true; @@ -1687,6 +1687,7 @@ class TWizardStepCollection extends TList */ public function __construct(TWizard $wizard) { + parent::__construct(); $this->_wizard=$wizard; } -- cgit v1.2.3