Version 4.7.8

applications/cms/modules/admin/pages/pages.php

@@ -362,23 +362,26 @@ FILE;
 	 */
 	protected function _afterSave( ?\IPS\Node\Model $old, \IPS\Node\Model $new, $lastUsedTab = FALSE )
 	{
-		/* If this page was the default in a folder, and it was moved to a new folder that already has a default, we need to unset the 
-			default page flag or there will be two defaults in the destination folder */
-		if( $old !== NULL AND $old->folder_id != $new->folder_id AND $old->default )
+		/* Is there a default page in the folder? */
+		try
 		{
-			/* Is there already a default page in the new folder? */
-			try
-			{
-				$existingDefault = \IPS\Db::i()->select( 'page_id', 'cms_pages', array( 'page_folder_id=? and page_default=?', $new->folder_id, 1 ) )->first();
+			$existingDefault = \IPS\Db::i()->select( 'page_id', 'cms_pages', array( 'page_folder_id=? and page_default=? and page_id <> ?', $new->folder_id, 1, $new->id ) )->first();
 
+			/* If this page was the default in a folder, and it was moved to a new folder that already has a default, we need to unset the
+			default page flag or there will be two defaults in the destination folder */
+			if( $old !== NULL AND $old->folder_id != $new->folder_id AND $old->default )
+			{
 				\IPS\Db::i()->update( 'cms_pages', array( 'page_default' => 0 ), array( 'page_id=?', $new->id ) );
 
 				\IPS\cms\Pages\Page::buildPageUrlStore();
 			}
-			catch( \UnderflowException $e )
-			{
-				/* No default found in destination folder, do nothing */
-			}
+		}
+		catch( \UnderflowException $e )
+		{
+			/* No default found in destination folder, make this the default */
+			\IPS\Db::i()->update( 'cms_pages', array( 'page_default' => 1 ), array( 'page_id=?', $new->id ) );
+
+			\IPS\cms\Pages\Page::buildPageUrlStore();
 		}
 		
 		/* If page filename changes or the folder ID changes, we need to clear front navigation cache*/