From 6fc2070a22cda40d174db205847dca4c214eeea6 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Wed, 14 Jan 2004 22:30:09 +0000 Subject: Patch 5114 by Kjartan: - Adds drupal_set_header() and drupal_get_headers(). - Cache now stores custom headers. - Replace theme_head() with drupal_get_html_head(), added drupal_set_html_head(). - Added RSS autodiscover links to node, blog and taxonomy pages. --- themes/chameleon/chameleon.theme | 2 +- themes/marvin/marvin.theme | 2 +- themes/xtemplate/xtemplate.theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'themes') diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index a162bb33e..0bb52adb0 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -38,7 +38,7 @@ function chameleon_header($title = "") { $output .= "\n"; $output .= "\n"; $output .= " ". ($title ? $title ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."\n"; - $output .= theme_head(); + $output .= drupal_get_html_head(); $output .= " \n"; $output .= " \n"; $output .= ""; diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme index b2d8d8316..0c090370a 100644 --- a/themes/marvin/marvin.theme +++ b/themes/marvin/marvin.theme @@ -19,7 +19,7 @@ function marvin_header() { $output = "\n"; $output .= "\n"; $output .= "\n"; - $output .= theme_head($main); + $output .= drupal_get_html_head(); $output .= ""; if ($title = drupal_get_title()) { diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme index 1c5e6e977..bac833398 100644 --- a/themes/xtemplate/xtemplate.theme +++ b/themes/xtemplate/xtemplate.theme @@ -92,7 +92,7 @@ function xtemplate_header() { $xtemplate->template->assign(array( "head_title" => (drupal_get_title() ? drupal_get_title() ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")), "site" => variable_get("site_name", "drupal"), - "head" => theme_head(), + "head" => drupal_get_html_head(), "stylesheet" => variable_get("xtemplate_stylesheet", "themes/xtemplate/xtemplate.css"), "onload_attributes" => theme_onload_attribute(), "logo" => variable_get("xtemplate_logo", "<img src=\"themes/xtemplate/images/druplicon.gif\" />"), -- cgit v1.2.3