? modules/block/._block.module
? modules/block/._block.test
? modules/simpletest/._drupal_web_test_case.php
? sites/all/modules/contrib
? sites/all/modules/custom
? sites/default/files
? sites/default/settings.php
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.427
diff -u -r1.427 block.module
--- modules/block/block.module	31 Jul 2010 12:54:58 -0000	1.427
+++ modules/block/block.module	22 Aug 2010 15:41:42 -0000
@@ -243,9 +243,12 @@
  *
  * Generates the administrator-defined blocks for display.
  */
-function block_block_view($delta = 0, $edit = array()) {
-  $block = db_query('SELECT body, format FROM {block_custom} WHERE bid = :bid', array(':bid' => $delta))->fetchObject();
-  $data['content'] = check_markup($block->body, $block->format, '', TRUE);
+function block_block_view($delta = 0) {
+  $block = db_query('SELECT bc.body, bc.format, b.title FROM {block_custom} bc LEFT JOIN {block} b ON (bc.bid = b.delta) WHERE bc.bid = :bid', array(':bid' => $delta))->fetchObject();
+  $data = array(
+    'subject' => $block->title == '<none>' ? '' : check_plain($block->title),
+    'content' => array('#markup' => check_markup($block->body, $block->format)),
+  );
   return $data;
 }
 
Index: modules/block/block.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.test,v
retrieving revision 1.57
diff -u -r1.57 block.test
--- modules/block/block.test	8 Aug 2010 19:35:49 -0000	1.57
+++ modules/block/block.test	22 Aug 2010 15:41:42 -0000
@@ -78,6 +78,12 @@
     // Check to see if the custom block was created by checking that it's in the database..
     $this->assertNotNull($bid, t('Custom block found in database'));
 
+    // Check that block_block_view gives the correct title and content.
+    $data = block_block_view($bid);
+    $format = db_query("SELECT format FROM {block_custom} WHERE bid = :bid", array(':bid' => $bid))->fetchField();
+    $this->assertEqual($custom_block['title'], $data['subject'], t('hook_block_view provides correct block title.'));
+    $this->assertEqual(check_markup($custom_block['body[value]'], $format), $data['content']['#markup'], t('hook_block_view provides correct block content.'));
+
     // Check if the block can be moved to all availble regions.
     $custom_block['module'] = 'block';
     $custom_block['delta'] = $bid;