Fixed issues with multilingual page titles

diff --git a/com.woltlab.wcf/templates/cms.tpl b/com.woltlab.wcf/templates/cms.tpl
index 55111b784af989a41b7b26af58ea8b4c5edc03af..7c803e016099617a4549ac4de9b563700cc73841 100644 (file)
--- a/com.woltlab.wcf/templates/cms.tpl
+++ b/com.woltlab.wcf/templates/cms.tpl
@@ -1,6 +1,9 @@
+{if !$__wcf->isLandingPage()}
+       {capture assign='pageTitle'}{$content[title]}{/capture}
+       {capture assign='contentTitle'}{$content[title]}{/capture}
+{/if}
+
 {capture assign='headContent'}
-       <link rel="canonical" href="{$canonicalURL}">
-       
        {if $page->isMultilingual}
                {foreach from=$page->getPageLanguages() item='pageLanguage'}
                        {if $pageLanguage->getLanguage()}

diff --git a/wcfsetup/install/files/lib/data/page/PageCache.class.php b/wcfsetup/install/files/lib/data/page/PageCache.class.php
index 1213cb748c6d6f0b20fb9d1e78d644652d8a3af9..46229ee47be639edddfbb5a0de1bbc2241bd970b 100644 (file)
--- a/wcfsetup/install/files/lib/data/page/PageCache.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageCache.class.php
@@ -94,7 +94,7 @@ class PageCache extends SingletonFactory {
                                        return $this->cache['pageTitles'][$pageID][$languageID];
                                }
                                
-                               return $this->cache['pageTitles'][$pageID][WCF::getUser()->getLanguage()->languageID];
+                               return $this->cache['pageTitles'][$pageID][WCF::getLanguage()->languageID];
                        }
                        else {
                                return $this->cache['pageTitles'][$pageID][0];