- Remove the <base href="">-tags from the themes; these are being added by
theme_head().4.2.x
parent
4499241fa1
commit
514a1a96ed
|
@ -17,14 +17,12 @@
|
|||
}
|
||||
|
||||
function header($title = "") {
|
||||
global $base_url;
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<?php print theme_head($main); ?>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<base href="<?php echo "$base_url/" ?>" />
|
||||
<title>
|
||||
<?php
|
||||
if ($title) {
|
||||
|
|
|
@ -44,7 +44,6 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<?php print theme_head($main); ?>
|
||||
<title><?php echo ($title ? ($title . " - ") : "") . variable_get(site_name, "drupal"); ?></title>
|
||||
<base href="<?php echo "$base_url/"; ?>" />
|
||||
<link rel="stylesheet" type="text/css" media="screen, projection" href="themes/unconed/unconed.css" />
|
||||
</head>
|
||||
<body text="#000000" bgcolor="<?php print $this->clc0; ?>" alink="#000000" link="#404040" vlink="#404040">
|
||||
|
|
|
@ -71,12 +71,9 @@ class Theme_xtemplate extends BaseTheme {
|
|||
}
|
||||
|
||||
function header($title = "") {
|
||||
global $base_url;
|
||||
|
||||
$this->template->assign(array(
|
||||
"title" => ($title ? $title." | ". variable_get("site_name", "drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")),
|
||||
"head" => theme_head(),
|
||||
"base" => "$base_url/",
|
||||
"onload_attributes" => theme_onload_attribute(),
|
||||
"primary_links" => variable_get("xtemplate_primary_links", l("edit primary links", "admin/system/themes/xtemplate")),
|
||||
"secondary_links" => variable_get("xtemplate_secondary_links", l("edit secondary links", "admin/system/themes/xtemplate"))
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
<head>
|
||||
<title>{title}</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<base href="{base}" />
|
||||
<style type="text/css" media="all">
|
||||
@import "themes/xtemplate/xtemplate.css";
|
||||
</style>
|
||||
|
|
Loading…
Reference in New Issue