From 5a9c77e8e1f67e886c128ae014722a14b0818535 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 2 Dec 2001 21:46:12 +0000
Subject: [PATCH] - Display the current node's title in the
<title></title>-tag.
---
node.php | 8 ++++----
themes/marvin/marvin.theme | 9 +++++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/node.php b/node.php
index adb89fca4bc8..e01fc98141ef 100644
--- a/node.php
+++ b/node.php
@@ -19,7 +19,7 @@ function node_render($node) {
break;
case t("Post comment"):
comment_post($edit);
- $theme->header();
+ $theme->header(check_output($node->title));
node_view($node);
comment_render($edit[id], $cid);
$theme->footer();
@@ -36,20 +36,20 @@ function node_render($node) {
break;
case t("Update settings"):
comment_settings(check_query($mode), check_query($order), check_query($threshold));
- $theme->header();
+ $theme->header(check_output($node->title));
node_view($node);
comment_render($id, $cid);
$theme->footer();
break;
case t("Update ratings"):
comment_moderate($moderate["comment"]);
- $theme->header();
+ $theme->header(check_output($node->title));
node_view($node);
comment_render($id, $cid);
$theme->footer();
break;
default:
- $theme->header();
+ $theme->header(check_output($node->title));
node_view($node);
comment_render($id, $cid);
$theme->footer();
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 37f9211da572..774a253993e5 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -18,7 +18,7 @@ class Theme extends BaseTheme {
var $foreground = "#000000";
var $background = "#EAEAEA";
- function header() {
+ function header($title = 0) {
global $HTTP_USER_AGENT;
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -27,7 +27,12 @@ function header() {
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>
<?php
- print variable_get("site_name", "drupal") ." - ". variable_get("site_slogan", "");
+ if ($title) {
+ print variable_get("site_name", "drupal") ." - $title";
+ }
+ else {
+ print variable_get("site_name", "drupal") ." - ". variable_get("site_slogan", "");
+ }
?>
</title>
<style type="text/css">
--
GitLab