diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 32e126a44d528a40c2448aa077ebec70af4f8bb7..47fbe1dace5255379ac945c91db67a62b6500443 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,7 @@ Panels 6.x-3.0-dev #530104 by stella: Fix import problem with mini panels. #535606: Mini panel deletion deleted all block config of all mini panels. #539418 by esmerel: Remove reference to panel page from module description. +#535722: Fix incorrect "title" tag on categories in add content modal. Panels 6.x-3.0-rc1 ================== diff --git a/includes/display-edit.inc b/includes/display-edit.inc index 19ca15107f3f70885e57be473fc4797e4a61e7bf..29e9ea46ac23b499096a8aa47f673bb77b25c00d 100644 --- a/includes/display-edit.inc +++ b/includes/display-edit.inc @@ -453,7 +453,7 @@ function panels_show_pane($display, $pane, $skin = TRUE) { 'attributes' => array('class' => 'ctools-use-modal'), ); } - + $style = panels_get_style((!empty($pane->style['style'])) ? $pane->style['style'] : 'default'); $links[] = array( @@ -721,7 +721,6 @@ function panels_add_content($cache, $panel_id, $key) { $content_type = ctools_get_content_type($type_name); foreach ($subtypes as $subtype_name => $subtype_info) { $title = filter_xss_admin($subtype_info['title']); - $description = isset($subtype_info['description']) ? $subtype_info['description'] : $title; $icon = ctools_content_admin_icon($subtype_info); @@ -784,7 +783,7 @@ function panels_add_content($cache, $panel_id, $key) { } $url = "panels/ajax/add-pane/$cache_key/$panel_id/$category"; - $selector .= ctools_ajax_text_button($name, $url, $description, $class); + $selector .= ctools_ajax_text_button($name, $url, '', $class); } $selector .= ''; diff --git a/plugins/task_handlers/panel_context.inc b/plugins/task_handlers/panel_context.inc index 783081441dd3c2514318161a19499cea3d5cae94..ed55a7e65bd5d2c7344e2d67533cfa1a3c3bd2e2 100644 --- a/plugins/task_handlers/panel_context.inc +++ b/plugins/task_handlers/panel_context.inc @@ -476,7 +476,7 @@ function panels_panel_context_admin_summary($handler, $task, $subtask, $page, $s $output .= '