diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-01-29 06:47:19 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-01-29 06:47:19 +0000 |
| commit | c8daca07d29ee006f34d7e4978d2f774a1d3da9b (patch) | |
| tree | 03f0dd2226d810e120961570bba51b08ae866ec2 | |
| parent | abc8317a0bf0bacd8daa1ce9e256868e586cd03a (diff) | |
| download | brdo-c8daca07d29ee006f34d7e4978d2f774a1d3da9b.tar.gz brdo-c8daca07d29ee006f34d7e4978d2f774a1d3da9b.tar.bz2 | |
- Patch #5448 by pz: removed code duplication from theme.inc.
| -rw-r--r-- | includes/common.inc | 4 | ||||
| -rw-r--r-- | includes/theme.inc | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/includes/common.inc b/includes/common.inc index bc8c57564..ab5317276 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -107,9 +107,9 @@ function drupal_set_html_head($data = NULL) { function drupal_get_html_head() { global $base_url; - $output = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />"; + $output = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"; $output .= "<base href=\"$base_url/\" />\n"; - $output .= "<style type=\"text/css\">\n"; + $output .= "<style type=\"text/css\" media=\"all\">\n"; $output .= "@import url(misc/drupal.css);\n"; $output .= "</style>\n"; diff --git a/includes/theme.inc b/includes/theme.inc index 03d92d980..eb0b53ae6 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -151,9 +151,6 @@ function theme_page($content, $title = NULL, $breadcrumb = NULL) { $output .= "<head>"; $output .= " <title>". (drupal_get_title() ? drupal_get_title() : variable_get('site_name', "drupal")) ."</title>"; $output .= drupal_get_html_head(); - $output .= " <style type=\"text/css\" media=\"all\">"; - $output .= " @import url(misc/drupal.css);"; - $output .= " </style>"; $output .= " </head>"; $output .= " <body style=\"background-color: #fff; color: #000;\"". theme("onload_attribute"). "\">"; |