From d7933b8f1e6ee5e9c9f9fdfbe4344c3f2c6ec39b Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 13 Sep 2017 13:44:19 +0200
Subject: [PATCH] Excluding disabled pages from landing page selection

Fixes #2421
---
 wcfsetup/install/files/acp/templates/applicationEdit.tpl        | 2 +-
 .../install/files/lib/acp/form/ApplicationEditForm.class.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
index 8b2efa1f75..20a003e333 100644
--- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
@@ -65,7 +65,7 @@
 					<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 					
 					{foreach from=$pageNodeList item=pageNode}
-						{if !$pageNode->requireObjectID}
+						{if !$pageNode->isDisabled && !$pageNode->requireObjectID}
 							<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $landingPageID} selected{/if} data-identifier="{@$pageNode->identifier}">{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
 						{/if}
 					{/foreach}
diff --git a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
index 0295a4c4ad..d8403dbf7e 100644
--- a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
@@ -183,7 +183,7 @@ class ApplicationEditForm extends AbstractForm {
 			if (!$page->pageID) {
 				throw new UserInputException('landingPageID');
 			}
-			else if ($page->requireObjectID) {
+			else if ($page->requireObjectID || $page->isDisabled) {
 				throw new UserInputException('landingPageID', 'invalid');
 			}
 		}
-- 
2.20.1