Version 4.3.6

applications/cms/widgets/Database.php

@@ -120,6 +120,13 @@ class _Database extends \IPS\Widget
 				try
 				{
 					$database = \IPS\cms\Databases::load( intval( $this->configuration['database'] ) );
+					
+					if ( ! $database->page_id and \IPS\cms\Pages\Page::$currentPage )
+					{
+						$database->page_id = \IPS\cms\Pages\Page::$currentPage->id;
+						$database->save();
+					}
+					
 					static::$html = \IPS\cms\Databases\Dispatcher::i()->setDatabase( $database->id )->run();
 				}
 				catch ( \OutOfRangeException $e )