From 0af47070030aadbcc44f0eba96d60c5e02da34f0 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Mon, 25 Jul 2005 06:59:37 +0000
Subject: [PATCH] - #27346: Don't display trailing | in page title with empty
slogan.
---
themes/engines/phptemplate/phptemplate.engine | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index d38d0351bd18..92046945802d 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(),
--
GitLab