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 /includes/theme.inc | |
| 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 'includes/theme.inc')
| -rw-r--r-- | includes/theme.inc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index e5b5ccbed..0bd2416bf 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -137,7 +137,7 @@ function theme_header() { $output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\">"; $output .= "<head>"; $output .= " <title>". (drupal_get_title() ? drupal_get_title() : variable_get('site_name', "drupal")) ."</title>"; - $output .= theme_head(); + $output .= drupal_get_html_head(); $output .= " <style type=\"text/css\" media=\"all\">"; $output .= " @import url(misc/drupal.css);"; $output .= " </style>"; @@ -462,26 +462,6 @@ function theme_xml_icon($url) { } /** - * Execute hook _head which is run at the start of the page, and output should - * be in the head tags. - * - * @param $main (optional) - * - * @return a string containing the @a error output. - */ -function theme_head($main = 0) { - global $base_url; - $output .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />"; - $output .= "<base href=\"$base_url/\" />\n"; - $output .= "<style type=\"text/css\">\n"; - $output .= "@import url(misc/drupal.css);\n"; - $output .= "</style>\n"; - $head = module_invoke_all("head", $main); - $output .= implode($head, "\n"); - return $output; -} - -/** * Execute hook _footer() which is run at the end of the page right before the * \</body> tag. * |