From d2d6ab4f88c2a31f5f2f369e34ab7ebc254124ea Mon Sep 17 00:00:00 2001 From: Ryan Wyllie Date: Thu, 30 Jul 2015 02:07:24 +0000 Subject: [PATCH] MDL-50446 block_site_main_menu: Fix the onclick property handling --- blocks/site_main_menu/block_site_main_menu.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php index e28c75bedf5..8b9e0d07eec 100644 --- a/blocks/site_main_menu/block_site_main_menu.php +++ b/blocks/site_main_menu/block_site_main_menu.php @@ -73,8 +73,9 @@ class block_site_main_menu extends block_list { $attrs['title'] = $cm->modfullname; $attrs['class'] = $cm->extraclasses . ' activity-action'; if ($cm->onclick) { - $attrs['id'] = html_writer::random_id('onclick'); - $OUTPUT->add_action_handler(new component_action('click', $cm->onclick), $attrs['id']); + // Get on-click attribute value if specified and decode the onclick - it + // has already been encoded for display. + $attrs['onclick'] = htmlspecialchars_decode($cm->onclick); } if (!$cm->visible) { $attrs['class'] .= ' dimmed'; @@ -161,8 +162,9 @@ class block_site_main_menu extends block_list { $attrs['title'] = $mod->modfullname; $attrs['class'] = $mod->extraclasses . ' activity-action'; if ($mod->onclick) { - $attrs['id'] = html_writer::random_id('onclick'); - $OUTPUT->add_action_handler(new component_action('click', $mod->onclick), $attrs['id']); + // Get on-click attribute value if specified and decode the onclick - it + // has already been encoded for display. + $attrs['onclick'] = htmlspecialchars_decode($mod->onclick); } if (!$mod->visible) { $attrs['class'] .= ' dimmed';