From 957d5958a4290f7dfb18d6aede6abf543bc6cdb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 1 Oct 2018 13:09:12 +0200
Subject: [PATCH] Work on website

---
 htdocs/website/index.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 19c9c31da71..1d277c32ed7 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -92,7 +92,7 @@ if (empty($action)) $action='preview';
 $object=new Website($db);
 $objectpage=new WebsitePage($db);
 
-$object->fetchAll();    // Init $object->records
+$object->fetchAll();    // Init $object->records with list of websites
 
 // If website not defined, we take first found
 if (empty($websitekey))
@@ -118,16 +118,24 @@ if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 	// Check if pageid is inside the new website, if not we reset param pageid
 	if ($res >= 0 && $object->id > 0)
 	{
-		if ($objectpage->fk_website != $object->id)	// We have a bad page.
+		if ($objectpage->fk_website != $object->id)	// We have a bad page that does not belong to web site
 		{
-			$res = $objectpage->fetch(0, $object->id, '');	// We search first page of web site
-			if ($res == 0)	// Page was not found, we reset it
+			if ($object->fk_default_home > 0)
 			{
-				$objectpage=new WebsitePage($db);
+				$res = $objectpage->fetch($object->fk_default_home, $object->id, '');	// We search first page of web site
+				if ($res > 0) $pageid = $object->fk_default_home;
 			}
-			else			// We found a page, we set pageid to it.
+			else
 			{
-				$pageid = $objectpage->id;
+				$res = $objectpage->fetch(0, $object->id, '');	// We search first page of web site
+				if ($res == 0)	// Page was not found, we reset it
+				{
+					$objectpage=new WebsitePage($db);
+				}
+				else			// We found a page, we set pageid to it.
+				{
+					$pageid = $objectpage->id;
+				}
 			}
 		}
 		else	// We have a valid page. We force pageid for the case we got the page with a fetch on ref.