From b50ecd03a2da0a96bd19d15ccfbf2f8289018d57 Mon Sep 17 00:00:00 2001
From: solotandem <jim@boombatower.com>
Date: Thu, 17 May 2012 16:31:34 -0500
Subject: [PATCH] Issue #1587788: Update remaining call to D6-style hook_block('view') to D7-style hook_block_view().

---
 plugins/content_types/block/block.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/content_types/block/block.inc b/plugins/content_types/block/block.inc
index 866f72e..3b5d179 100644
--- a/plugins/content_types/block/block.inc
+++ b/plugins/content_types/block/block.inc
@@ -226,11 +226,11 @@ function ctools_block_content_type_admin_title($subtype, $conf) {
  */
 function ctools_block_content_type_admin_info($subtype, $conf) {
   list($module, $delta) = _ctools_block_get_module_delta($subtype, $conf);
-  $block = (object) module_invoke($module, 'block', 'view', $delta);
+  $block = (object) module_invoke($module, 'block_view', $delta);
 
   // Sanitize the block because <script> tags can hose javascript up:
   if (!empty($block->content)) {
-    $block->content = filter_xss_admin($block->content);
+    $block->content = filter_xss_admin(drupal_render($block->content));
   }
 
   if (!empty($block) && !empty($block->subject)) {
-- 
1.7.3.4