Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.314 diff -u -F^f -r1.314 theme.inc --- includes/theme.inc 1 Sep 2006 08:44:53 -0000 1.314 +++ includes/theme.inc 5 Sep 2006 03:21:33 -0000 @@ -359,7 +359,7 @@ function theme_placeholder($text) { * A string containing the entire HTML page. */ function theme_page($content) { - $output = "\n"; + $output = ''; $output .= ''; $output .= ''; $output .= ' '. (drupal_get_title() ? strip_tags(drupal_get_title()) : variable_get('site_name', 'drupal')) .''; @@ -382,16 +382,12 @@ function theme_page($content) { } $output .= theme('help'); - $output .= theme('status_messages'); - - $output .= "\n\n"; $output .= $content; $output .= drupal_get_feeds(); - $output .= "\n\n"; $output .= ''; - $output .= theme_closure(); + $output .= theme('closure'); $output .= ''; return $output; @@ -822,10 +818,12 @@ function theme_box($title, $content, $re * A string containing the block output. */ function theme_block($block) { - $output = "
module\" id=\"block-$block->module-$block->delta\">\n"; - $output .= "

$block->subject

\n"; - $output .= "
$block->content
\n"; - $output .= "
\n"; + $output = '
'; + if ($block->subject) { + $output .= '

'. $block->subject .'

'; + } + $output .= '
'. $block->content .'
'; + $output .= '
'; return $output; }