- Patch #821202 by johnbarclay: Garland Block template needs to implement theme_block_preprocess() to deal with attributes correctly.

2 files changed, 8 insertions, 13 deletions

diff --git a/themes/garland/block.tpl.php b/themes/garland/block.tpl.php
deleted file mode 100644
index b4fc099d2..000000000
--- a/themes/garland/block.tpl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// $Id$
-?>
-<div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
-
-  <?php print render($title_prefix); ?>
-<?php if (!empty($block->subject)): ?>
-  <h2 class="title"<?php print $title_attributes; ?>><?php print $block->subject ?></h2>
-<?php endif;?>
-  <?php print render($title_suffix); ?>
-
-  <div class="content"<?php print $content_attributes; ?>><?php print $content ?></div>
-</div>
diff --git a/themes/garland/template.php b/themes/garland/template.php
index 975bc55f5..ad5692594 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -114,6 +114,14 @@ function garland_preprocess_page(&$vars) {
 }
 
 /**
+ * Override or insert variables into the block template.
+ */
+function garland_preprocess_block(&$vars) {
+  $vars['title_attributes_array']['class'][] = 'title';
+  $vars['classes_array'][] = 'clearfix';
+}
+
+/**
  * Override or insert variables into the page template.
  */
 function garland_process_page(&$vars) {