From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 10 Dec 2016 19:42:13 +0000 (+0100)
Subject: Added option to disable page title on landing page
X-Git-Tag: 3.0.0_RC_1~50
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4ad11e412b080432f7e112b45b8751f0c22377e3;p=GitHub%2FWoltLab%2FWCF.git

Added option to disable page title on landing page
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 9d09c471cf..68880a6105 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -418,6 +418,11 @@
 				<optiontype>textI18n</optiontype>
 				<supporti18n>1</supporti18n>
 			</option>
+			<option name="use_page_title_on_landing_page">
+				<categoryname>general.page</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<option name="meta_keywords">
 				<categoryname>general.page</categoryname>
 				<optiontype>text</optiontype>
diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index 3a67de96a9..7869e9e309 100644
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -101,7 +101,7 @@
 						{@$contentHeader}
 					{else}
 						{if $contentTitle|empty}
-							{if $__wcf->isLandingPage()}
+							{if $__wcf->isLandingPage() && USE_PAGE_TITLE_ON_LANDING_PAGE}
 								{capture assign='contentTitle'}{PAGE_TITLE|language}{/capture}
 								{capture assign='contentDescription'}{PAGE_DESCRIPTION|language}{/capture}
 							{elseif $__wcf->getActivePage() != null && $__wcf->getActivePage()->getTitle()}
diff --git a/constants.php b/constants.php
index 32f79af2c9..bbf9f66706 100644
--- a/constants.php
+++ b/constants.php
@@ -215,3 +215,4 @@ define('SHOW_UPDATE_NOTICE_FRONTEND', 1);
 define('LANGUAGE_USE_INFORMAL_VARIANT', 0);
 define('SHOW_STYLE_CHANGER', 0);
 define('ARTICLE_SORT_ORDER', 'DESC');
+define('USE_PAGE_TITLE_ON_LANDING_PAGE', 1);
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 6df8c1ab8a..9f95be5264 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1234,6 +1234,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.media_small_thumbnail_width"><![CDATA[Breite der kleinen Vorschaugrafiken]]></item>
 		<item name="wcf.acp.option.article_sort_order"><![CDATA[Sortierungsreihenfolge]]></item>
 		<item name="wcf.acp.option.article_sort_order.description"><![CDATA[Standard-Reihenfolge für die Liste der Artikel.]]></item>
+		<item name="wcf.acp.option.use_page_title_on_landing_page"><![CDATA[Titel der Seite als Überschrift auf Startseite anzeigen]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 41f2fd4073..7f841178ef 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1237,6 +1237,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.option.media_small_thumbnail_width"><![CDATA[Small Thumbnail Width]]></item>
 		<item name="wcf.acp.option.article_sort_order"><![CDATA[Sort Order]]></item>
 		<item name="wcf.acp.option.article_sort_order.description"><![CDATA[Choose default sort order of articles.]]></item>
+		<item name="wcf.acp.option.use_page_title_on_landing_page"><![CDATA[Use page title on landing page]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">