- Display the current node's title in the <title></title>-tag.

5a9c77e8 · Dries Buytaert · cd58e22e · 5a9c77e8 · 5a9c77e8
Commit 5a9c77e8 authored 23 years ago by Dries Buytaert
--- 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();

--- 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">