Version 5.0.14

applications/core/modules/front/system/announcement.php

@@ -93,6 +93,8 @@ class announcement extends Controller
 
 	/**
 	 * Check permissions for linked content item
+	 * 
+	 * called from js/front/controllers/modcp/ips.modcp.announcementForm.js
 	 *
 	 * @return	void
 	 */
@@ -128,6 +130,7 @@ class announcement extends Controller
 		}
 
 		$class = $furlDefinition[ $url->seoTemplate ]['verify'];
+		/** @var Item $item */
 		$item = $class::loadFromUrl( $url );
 
 		/* If the class does not have our method, return a not_verified status */

applications/core/modules/front/system/editor.php

@@ -136,6 +136,7 @@ class editor extends Controller
 			$externalEmbedAllowed,
 			$externalImageAllowed,
 			$internalEmbedAllowed,
+			Settings::i()->iframely_enabled ? Settings::i()->iframely_api_key : false, // we need to consider this when creating the cache key because it can change the results
 		]));
 
 		try

applications/core/modules/front/system/register.php

@@ -127,6 +127,12 @@ class register extends Controller
 			Output::i()->showOffline();
 		}
 
+		/* Are we already logged in? */
+		if( Member::loggedIn()->member_id )
+		{
+			Output::i()->redirect( Url::internal( "" ) );
+		}
+
 		if( Application::appIsEnabled( 'nexus' ) )
 		{
 			if ( Member::loggedIn()->canAccessModule( Module::get( 'nexus', 'store' ) ) and ( Settings::i()->nexus_reg_force or !isset( Request::i()->noPurchase ) ) and Package::haveRegistrationProducts() )
@@ -245,27 +251,30 @@ class register extends Controller
 		};
 
 		/* Do we have any profile completion steps marked for registration? */
-		foreach( ProfileStep::loadAll() as $step )
+		if( Login::registrationType() == 'full' )
 		{
-			if( $step->registration )
+			foreach( ProfileStep::loadAll() as $step )
 			{
-				$extension = $step->extension;
-				foreach( $extension::wizard() as $key => $form )
+				if( $step->registration )
 				{
-					if( $key == $step->key )
+					$extension = $step->extension;
+					foreach( $extension::wizard() as $key => $form )
 					{
-						$steps[ $key ] = $form;
+						if( $key == $step->key )
+						{
+							$steps[ $key ] = $form;
+						}
 					}
-				}
 
-				/* This happens when the user has already completed the step.
-				We need to use a dummy function, or the wizard gets thrown out of whack. */
-				if( !array_key_exists( $step->key, $steps ) )
-				{
-					$steps[ $step->key ] = function( $data )
+					/* This happens when the user has already completed the step.
+					We need to use a dummy function, or the wizard gets thrown out of whack. */
+					if( !array_key_exists( $step->key, $steps ) )
 					{
-						return $data;
-					};
+						$steps[ $step->key ] = function( $data )
+						{
+							return $data;
+						};
+					}
 				}
 			}
 		}
@@ -357,12 +366,16 @@ class register extends Controller
 				Session::i()->setMember( $member );
 				Device::loadOrCreate( $member, FALSE )->updateAfterAuthentication( TRUE );
 
-				/* If we have profile steps on registration, return instead of redirect */
-				foreach( ProfileStep::loadAll() as $step )
+				/* If we have profile steps on registration, return instead of redirect
+				but ONLY if we are using full registration */
+				if( Login::registrationType() == 'full' )
 				{
-					if( $step->registration )
+					foreach( ProfileStep::loadAll() as $step )
 					{
-						return [ 'member' => $member->member_id ];
+						if( $step->registration )
+						{
+							return [ 'member' => $member->member_id ];
+						}
 					}
 				}