diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-01-14 22:30:09 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-01-14 22:30:09 +0000 |
| commit | 6fc2070a22cda40d174db205847dca4c214eeea6 (patch) | |
| tree | 84a96893aaea2ff4dad96404acf7b12e6fabfb1d /themes | |
| parent | 01e9b5a0f01e88e3c804cdef64676eebed56520b (diff) | |
| download | brdo-6fc2070a22cda40d174db205847dca4c214eeea6.tar.gz brdo-6fc2070a22cda40d174db205847dca4c214eeea6.tar.bz2 | |
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.
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/chameleon/chameleon.theme | 2 | ||||
| -rw-r--r-- | themes/marvin/marvin.theme | 2 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.theme | 2 |
3 files changed, 3 insertions, 3 deletions
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 .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n"; $output .= "<head>\n"; $output .= " <title>". ($title ? $title ." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n"; - $output .= theme_head(); + $output .= drupal_get_html_head(); $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"themes/chameleon/default.css\" />\n"; $output .= " <link rel=\"stylesheet\" type=\"text/css\" href=\"". variable_get("chameleon_stylesheet", "themes/chameleon/pure.css") ."\" />\n"; $output .= "</head>"; 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 = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; $output .= "<html>\n"; $output .= "<head>\n"; - $output .= theme_head($main); + $output .= drupal_get_html_head(); $output .= "<title>"; 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\" />"), |