diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-12-16 21:06:34 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-12-16 21:06:34 +0000 |
| commit | 670a292277682351c373780746aedd5c110b3b08 (patch) | |
| tree | f6122c8d99f90f001e0d5e0d84f2dde8f99e0214 /includes/theme.inc | |
| parent | 595c790a9c488b16875e4a0f8eb5a35e0df2845c (diff) | |
| download | brdo-670a292277682351c373780746aedd5c110b3b08.tar.gz brdo-670a292277682351c373780746aedd5c110b3b08.tar.bz2 | |
- Reworked 404 (page not found) handling. Patch by walkah. You can specify a
custom 404 page in the administration page. As a result, error.php could be
removed.
Diffstat (limited to 'includes/theme.inc')
| -rw-r--r-- | includes/theme.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 0df0e2fba..7bb62b82d 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -131,13 +131,11 @@ function path_to_theme() { * @return a string containing the @a header output. */ function theme_header() { - global $base_url; - $output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; $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($main); + $output .= theme_head(); $output .= " <style type=\"text/css\" media=\"all\">"; $output .= " @import url(misc/drupal.css);"; $output .= " </style>"; @@ -366,10 +364,10 @@ function theme_box($title, $content, $region = "main") { * @return a string containing the @a box output. */ function theme_block($block) { - $output = "<div class=\"block block-$block->module\" id=\"block-$block->module-$block->delta\">"; - $output .= " <h2 class=\"title\">$block->subject</h2>"; - $output .= " <div class=\"content\">$block->content</div>"; - $output .= "</div>"; + $output = "<div class=\"block block-$block->module\" id=\"block-$block->module-$block->delta\">\n"; + $output .= " <h2 class=\"title\">$block->subject</h2>\n"; + $output .= " <div class=\"content\">$block->content</div>\n"; + $output .= "</div>\n"; return $output; } |