Permalink
Browse files

Merging from HEAD:

Fix for bug 4203:

When adding recurring events, if the event title contained an apostrophe
then only the first event of the series would get created. Tricky bad
interaction with add_to_log, the reporter for this should get a prize. ;-)
  • Loading branch information...
1 parent faf8922 commit 34225def25465abb7246db3e35eb584bdc9dc96f defacer committed Oct 24, 2005
Showing with 3 additions and 4 deletions.
  1. +3 −4 calendar/event.php
View
7 calendar/event.php
@@ -211,8 +211,7 @@
$eventid = insert_record('event', $form, true);
/// Log the event entry.
- $form->name = stripslashes($form->name); //To avoid double-slashes
- add_to_log($form->courseid, 'calendar', 'add', 'event.php?action=edit&id='.$eventid, $form->name);
+ add_to_log($form->courseid, 'calendar', 'add', 'event.php?action=edit&id='.$eventid, stripslashes($form->name));
if ($form->repeat) {
for($i = 1; $i < $form->repeats; $i++) {
@@ -226,9 +225,9 @@
/// Get the event id for the log record.
$eventid = insert_record('event', $form, true);
+
/// Log the event entry.
- $form->name = stripslashes($form->name); //To avoid double-slashes
- add_to_log($form->courseid, 'calendar', 'add', 'event.php?action=edit&amp;id='.$eventid, $form->name);
+ add_to_log($form->courseid, 'calendar', 'add', 'event.php?action=edit&amp;id='.$eventid, stripslashes($form->name));
}
}

0 comments on commit 34225de

Please sign in to comment.