Merged fix for MDL-6819

diff --git a/calendar/lib.php b/calendar/lib.php
index f4be9d64129369dfc2967be08bf2efec5d662855..018e2aca5938df8c663901c0c5af16b449fc69f7 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -338,6 +338,7 @@ function calendar_get_popup($is_today, $event_timestart, $popupcontent='') {
         $popupcaption .= get_string('eventsfor', 'calendar', userdate($event_timestart, get_string('strftimedayshort')));
     }
     $popupcontent = str_replace("'", "\'", htmlspecialchars($popupcontent));
+    $popupcaption = str_replace("'", "\'", htmlspecialchars($popupcaption)); 
     $popup = 'onmouseover="return overlib(\''.$popupcontent.'\', CAPTION, \''.$popupcaption.'\');" onmouseout="return nd();"';
     return $popup;
 }