Added option to disable page title on landing page

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 9d09c471cf968381cdf1505fc78f881ccfe92a32..68880a6105860096421b8e208f4a8213a394b04c 100644 (file)
--- 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 3a67de96a97dd1128b8498ba8b6b4ee3ce6351b1..7869e9e309354b12523f5e9e2c50dc618a5c116c 100644 (file)
--- 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 32f79af2c99821219a6c26ebce635434c73a260f..bbf9f6670686d1c55797931df3a638c96ba9bff4 100644 (file)
--- 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 6df8c1ab8aa7be9bc39139d98d2dfac1e6dd68b9..9f95be526420cb03c797cdbeef463770371f7dec 100644 (file)
--- 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 41f2fd40733e6d698bcbbbfa09a1d44529ac02b7..7f841178ef58f13e566e93edd969e5b0ee401d8b 100644 (file)
--- 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">