- Patch #5448 by pz: removed code duplication from theme.inc.
parent
abc8317a0b
commit
c8daca07d2
|
@ -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";
|
||||
|
||||
|
|
|
@ -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"). "\">";
|
||||
|
|
Loading…
Reference in New Issue