Version 5.0.13

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

@@ -18,6 +18,7 @@ use IPS\cms\widgets\Blocks;
 use IPS\Db;
 use IPS\Dispatcher\Controller;
 use IPS\Helpers\Form;
+use IPS\Log;
 use IPS\Member;
 use IPS\Output;
 use IPS\Patterns\ActiveRecordIterator;
@@ -33,6 +34,7 @@ use function count;
 use function defined;
 use function explode;
 use function in_array;
+use function json_encode;
 
 if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
@@ -122,6 +124,11 @@ class widgets extends Controller
 					continue;
 				}
 
+                if( !$block->isExecutableByPage( $this->pageApp, $this->pageModule, $this->pageController ) )
+                {
+                    continue;
+                }
+
 				/* Is this widget hidden from the block list? */
 				if( !$block::$showInBlockList )
 				{
@@ -527,6 +534,14 @@ class widgets extends Controller
 			$pageController = 'global';
 		}
 
+		/* Stop Pages widgets from being stored here */
+		if ( $pageApp === 'cms' )
+		{
+			/* Log it */
+			Log::log( 'Pages widget wants be stored in core_widget_areas: ' . json_encode( $area->toArray( true, false ) ), 'page_builder' );
+			return;
+		}
+
 		/* If we have no content, clear this out entirely */
 		if( !$area->hasWidgets() )
 		{