diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-07-25 06:59:37 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-07-25 06:59:37 +0000 |
| commit | 0af47070030aadbcc44f0eba96d60c5e02da34f0 (patch) | |
| tree | 9c2d5e75c8733182d667a9cdf2e2e5482b0579f8 /themes | |
| parent | f99d532111f465c54fa99ac045b3387399f4a2f6 (diff) | |
| download | brdo-0af47070030aadbcc44f0eba96d60c5e02da34f0.tar.gz brdo-0af47070030aadbcc44f0eba96d60c5e02da34f0.tar.bz2 | |
- #27346: Don't display trailing | in page title with empty slogan.
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/engines/phptemplate/phptemplate.engine | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine index d38d0351b..920469458 100644 --- a/themes/engines/phptemplate/phptemplate.engine +++ b/themes/engines/phptemplate/phptemplate.engine @@ -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(), |