summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--zen/template.block-editing.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f6f9d7a..a7f53b9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,5 @@
Zen 6.x-1.x-dev
+ #365205: block editing link doesn't work with Menu Block 6.x-2.1 and later
#308251 by Garrett Albright: Improve icon placement on status, warning, and error messages
* Added $body_classes_array variable to page template
#343945: Fix zen_breadcrumb_title setting to use proper menu_get_active_item()
diff --git a/zen/template.block-editing.inc b/zen/template.block-editing.inc
index 9dc95c5..790b01e 100644
--- a/zen/template.block-editing.inc
+++ b/zen/template.block-editing.inc
@@ -74,7 +74,7 @@ function zen_preprocess_block_editing(&$vars, $hook) {
}
// Display 'edit menu' for Menu block blocks.
elseif ($block->module == 'menu_block' && user_access('administer menu')) {
- $menu_name = variable_get('menu_block_' . $block->delta . '_menu_name', 'navigation');
+ list($menu_name, ) = split(':', variable_get("menu_block_{$block->delta}_parent", 'navigation:0'));
$edit_links[] = l('<span>' . t('edit menu') . '</span>', 'admin/build/menu-customize/' . $menu_name,
array(
'attributes' => array(