From 0281833bb7c2bedcd786b8c002ceea325898227c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 20 Oct 2010 00:47:44 +0000
Subject: - Patch #943558 by joachim: 'block_callback()' in menu_router() table
 has no purpose.

---
 modules/system/system.admin.inc |  4 ----
 modules/system/system.install   | 14 +++++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'modules')

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 0c2ac099f..c8a4f738a 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -34,10 +34,6 @@ function system_admin_config_page() {
       }
       $block = $item;
       $block['content'] = '';
-      if ($item['block_callback'] && function_exists($item['block_callback'])) {
-        $function = $item['block_callback'];
-        $block['content'] .= $function();
-      }
       $block['content'] .= theme('admin_block_content', array('content' => system_admin_menu_block($item)));
       if (!empty($block['content'])) {
         $block['show'] = TRUE;
diff --git a/modules/system/system.install b/modules/system/system.install
index 23e2e442b..ad9bc8c70 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1092,13 +1092,6 @@ function system_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
-      'block_callback' => array(
-        'description' => 'Name of a function used to render the block on the system administration page for this item.',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
       'description' => array(
         'description' => 'A description of this item.',
         'type' => 'text',
@@ -2901,6 +2894,13 @@ function system_update_7063() {
   }
 }
 
+/**
+ * Remove block_callback field from {menu_router}.
+ */
+function system_update_7064() {
+  db_drop_field('menu_router', 'block_callback');
+}
+
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
-- 
cgit v1.2.3