[MDL-36303] Event links in calendar block have HTML special entities - Moodle Tracker

XML

Word

Printable

Testing Instructions:
Hide

Add two events to calendar

On calendar block, make sure both events are visible.

Click on event and make sure you are redirected to proper event and link should not contain

&
Show
Add two events to calendar On calendar block, make sure both events are visible. Click on event and make sure you are redirected to proper event and link should not contain &
Affected Branches:
MOODLE_24_STABLE
Fixed Branches:
MOODLE_24_STABLE
Pull from Repository:
git://github.com/rajeshtaneja/moodle.git
Pull Master Branch:
wip-mdl-36303
Pull Master Diff URL:
https://github.com/rajeshtaneja/moodle/compare/master...wip-mdl-36303

While adding Aria attributes we used html_writer which converts & to &amp; for event links.

calendar/lib.php - Line 359 should be reverted back from

$cell = html_writer::link((string)$dayhref, $day, array('aria-controls' => $popupid.'_panel', 'id' => $popupid));

$cell = '<a href="'.(string)$dayhref.'" '.$popupid.' aria-controls="'.$popupid.'_panel" id="'.$popupid.'">'.$day.'</a>';

Steps to reproduce:

Add two events to calendar
On the calendar block, make sure both events are visible.
Click on event and make sure you are redirected to proper event and link should not contain &

is a regression caused by

MDL-30889 hovering over calendar events is not keyboard accessible

Testing discovered

MDL-16660 Calendar: IMPORT or Subscribe to iCal feed into Moodle calendar