Merge branch 'master' into bbmaster2

This commit is contained in:
Helmut Merz 2016-03-17 16:15:23 +01:00
commit 354dfeda7f
3 changed files with 5 additions and 4 deletions

View file

@ -65,8 +65,9 @@ class LayoutNodeView(Page, BaseView):
if self.target is not None:
targetView = component.getMultiAdapter((self.target, self.request),
name='layout')
if targetView.title not in parts:
parts.append(targetView.title)
title = getattr(targetView, 'headTitle', targetView.title)
if title not in parts:
parts.append(title)
if self.globalOptions('reverseHeadTitle'):
parts.reverse()
return ' - '.join(parts)