Version 4.1.19

system/Helpers/Wizard/Wizard.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Wizard Helper
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @since		25 Jul 2013
  * @version		SVN_VERSION_NUMBER
  */
@@ -152,15 +152,16 @@ class _Wizard
 					break;
 				}
 			}
+
 			/* Get it's output */
 			$output = call_user_func( $this->steps[ $activeStep ], $data );
 			while ( is_array( $output ) )
 			{
 				$data = array_merge( $data, $output );
-				
+
 				$nextStep = NULL;
 				$foundJustDone = FALSE;
-				
+
 				foreach ( $stepKeys as $key )
 				{
 					if ( $foundJustDone )
@@ -173,14 +174,14 @@ class _Wizard
 						$foundJustDone = TRUE;
 					}
 				}
-												
+
+				/* Update the Wizard session data */
 				$_SESSION[ 'wizard-' . md5( $this->baseUrl ) . '-step' ] = $activeStep;
+				$_SESSION[ 'wizard-' . md5( $this->baseUrl ) . '-data' ] = $data;
+
 				$output = call_user_func( $this->steps[ $activeStep ], $data );
 			}
-											
-			/* Save the data */
-			$_SESSION[ 'wizard-' . md5( $this->baseUrl ) . '-data' ] = $data;
-						
+
 			/* Display */
 			return call_user_func( $this->template, $stepKeys, $activeStep, $output, $this->baseUrl, $this->showSteps );
 		}
@@ -188,5 +189,9 @@ class _Wizard
 		{
 			\IPS\IPS::exceptionHandler( $e );
 		}
+		catch ( \Throwable $e )
+		{
+			\IPS\IPS::exceptionHandler( $e );
+		}
 	}
 }