Version 5.0.6

system/Member/ProfileStep.php

@@ -28,6 +28,7 @@ use IPS\Node\Model;
 use IPS\Patterns\ActiveRecordIterator;
 use IPS\Settings;
 use OutOfBoundsException;
+use OutOfRangeException;
 use function count;
 use function defined;
 use function is_array;
@@ -462,8 +463,15 @@ class ProfileStep extends Model
 		}
 
 		list( $app, $extension ) = explode( '_', $this->_data['extension'] );
-		$class = "\\IPS\\{$app}\\extensions\\core\\ProfileSteps\\{$extension}";
-		return new $class;
+		try
+		{
+			$class = Application::getExtensionClass( $app, 'ProfileSteps', $extension );
+			return new $class;
+		}
+		catch( OutOfRangeException )
+		{
+			return null;
+		}
 	}
 	
 	/**
@@ -642,18 +650,16 @@ class ProfileStep extends Model
 			$return[ str_replace( 'profile_', '', $key ) ] = $value;
 		}
 
-		try
+		/*try
 		{
-			$ext		= static::findExtensionFromAction( $return['step_completion_act'] );
-			$this->extension = $ext;
-			$ext		= explode( '_', $ext );
-			$class		= "\\IPS\\{$ext[0]}\\extensions\\core\\ProfileSteps\\{$ext[1]}";
-			$extension	= new $class;
+			$ext = explode( '_', static::findExtensionFromAction( $return['step_completion_act'] ) );
+			$class = Application::getExtensionClass( $ext[0], 'ProfileSteps', $ext[1] );
+			$return['step_extension'] = implode( "_", $ext );
 		}
-		catch( OutOfBoundsException $e )
+		catch( OutOfBoundsException | OutOfRangeException $e )
 		{
 			throw new InvalidArgumentException;
-		}
+		}*/
 	
 		return $return;
 	}
@@ -746,8 +752,12 @@ class ProfileStep extends Model
 		if( $extensionKey = static::findExtensionFromAction( $key ) )
 		{
 			list( $app, $extension ) = explode( '_', $extensionKey );
-			$class = "\\IPS\\{$app}\\extensions\\core\\ProfileSteps\\{$extension}";
-			return new $class;
+			try
+			{
+				$class = Application::getExtensionClass( $app, 'ProfileSteps', $extension );
+				return new $class;
+			}
+			catch( OutOfRangeException ){}
 		}
 
 		return null;