Version 4.3.6

applications/cms/sources/Pages/Page.php

@@ -1045,7 +1045,7 @@ class _Page extends \IPS\Node\Model implements \IPS\Node\Permissions
 							$template = \IPS\cms\Templates::load( $key );
 							
 							$return[ $thing ][ $key ] = \IPS\Http\Url::createFromString( \IPS\Http\Url::baseUrl() . "/applications/cms/interface/developer/developer.php" )
-								->setQueryString( 'file', '/themes/cms/' . $template->location . '/' . $template->group . '/' . $template->title );
+								->setQueryString( 'file', 'cms/' . $template->location . '/' . $template->group . '/' . $template->title );
 						}
 						catch( \OutOfRangeException $e )
 						{
@@ -1933,6 +1933,11 @@ class _Page extends \IPS\Node\Model implements \IPS\Node\Permissions
 	 */
 	public function mapToDatabase( $databaseId )
 	{
+		/* Ensure this page has an ID (as in, $page->save() has not been called yet on a new page) */
+		if ( ! $this->id )
+		{
+			throw new \LogicException('cms_err_page_id_is_empty');
+		}
 		try
 		{
 			/* is this page already in use */
@@ -2021,6 +2026,9 @@ class _Page extends \IPS\Node\Model implements \IPS\Node\Permissions
 		
 		unset( \IPS\Data\Store::i()->frontNavigation );
 	 
+		/* Remove any widgets for this page */
+		\IPS\Db::i()->delete( 'cms_page_widget_areas', array( 'area_page_id=?', $this->id ) );
+		
 		parent::delete();
 		
 		if ( $this->full_path and \IPS\Theme::designersModeEnabled() )