diff options
| -rw-r--r-- | includes/menu.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 4 | ||||
| -rw-r--r-- | modules/system/system.install | 14 |
3 files changed, 7 insertions, 13 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index e040fc9d9..badfb368f 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -3523,7 +3523,6 @@ function _menu_router_save($menu, $masks) { 'theme_callback', 'theme_arguments', 'type', - 'block_callback', 'description', 'position', 'weight', @@ -3554,7 +3553,6 @@ function _menu_router_save($menu, $masks) { 'theme_callback' => $item['theme callback'], 'theme_arguments' => serialize($item['theme arguments']), 'type' => $item['type'], - 'block_callback' => $item['block callback'], 'description' => $item['description'], 'position' => $item['position'], 'weight' => $item['weight'], 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', @@ -2902,6 +2895,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. */ |