removed useless calls to empty contructor; reverted some additional undocumented changes; upported the "cgi workaround" to trunk/; large (fake) changeset are due to mixed cr/crlf used previously

1 files changed, 16 insertions, 17 deletions

diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 4252a159..a9268b2b 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2010 PradoSoft

+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.WebControls

@@ -1397,21 +1397,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;

@@ -1693,7 +1693,6 @@ class TWizardStepCollection extends TList
 	 */

 	public function __construct(TWizard $wizard)

 	{

-		parent::__construct();

 		$this->_wizard=$wizard;

 	}