Commit 0af47070 authored by Steven Wittens's avatar Steven Wittens
Browse files

- #27346: Don't display trailing | in page title with empty slogan.

parent f99d5321
......@@ -142,8 +142,19 @@ function phptemplate_page($content) {
}
$sidebar_indicator = null;
// Construct page title
if (drupal_get_title()) {
$head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'drupal'));
}
else {
$head_title = array(variable_get('site_name', 'drupal'));
if (variable_get('site_slogan', '')) {
$head_title[] = variable_get('site_slogan', '');
}
}
$variables = array(
'head_title' => (drupal_get_title() ? strip_tags(drupal_get_title()) .' | '. variable_get('site_name', 'drupal') : variable_get('site_name', 'drupal') .' | '. variable_get('site_slogan', '')),
'head_title' => implode(' | ', $head_title),
'language' => $GLOBALS['locale'],
'site' => variable_get('site_name', 'drupal'),
'head' => drupal_get_html_head(),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment