Commit 27059ca5 authored by dsnopek's avatar dsnopek Committed by Dave Reid

Issue #2418803 by dsnopek: Fatal error when using with CTools 1.6+ due to...

Issue #2418803 by dsnopek: Fatal error when using with CTools 1.6+ due to change in plugin caching behavior.
parent 193b23a0
......@@ -17,6 +17,9 @@ $plugin = array(
'title' => t('Menu tree'),
);
// Load the standard config form.
module_load_include('inc', 'menu_block', 'menu_block.admin');
/**
* Supplies a list of menu tree content sub-types.
*/
......@@ -100,8 +103,6 @@ function menu_block_menu_tree_content_type_render($subtype, $conf, $args, $conte
function menu_block_menu_tree_content_type_edit_form($form, &$form_state) {
$conf = $form_state['conf'];
// Load the standard config form.
module_load_include('inc', 'menu_block', 'menu_block.admin');
// Create a pseudo form state.
$sub_form_state = array('values' => $conf);
$form += menu_block_configure_form($form, $sub_form_state);
......@@ -143,7 +144,6 @@ function menu_block_menu_tree_content_type_admin_title($subtype, $conf, $context
}
else {
// Build the menu tree.
module_load_include('inc', 'menu_block', 'menu_block.admin');
$output = _menu_block_format_title($conf);
}
return $output;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment