Commit 98da70dd authored by Robert Rollins's avatar Robert Rollins

Issue [#2049697]: Worked around a bug in the Date Repeat module.

date_repeat_split_rrule() calls functions from other .inc files, but doesn't
directly load those files. So I made Date iCal load them before calling it.
parent c7bcd9c8
......@@ -291,7 +291,7 @@ class date_ical_plugin_row_ical_entity extends views_plugin_row {
else {
$summary = check_plain($summary_field['value']);
}
$data['summary'] = ($summary)? $summary : $data['summary'];
$data['summary'] = $summary ? $summary : $data['summary'];
}
}
// Allow other modules to alter the HTML of the Summary and Description,
......
......@@ -192,7 +192,9 @@ class date_ical_plugin_style_ical_feed extends views_plugin_style {
// Handle repeating dates from the date_repeat module.
if (!empty($event['rrule']) && module_exists('date_repeat')) {
// Split the rrule into the actual rule, exceptions and additions.
// Split the rrule into the actual rule, exceptions, and additions.
module_load_include('inc', 'date_api', 'date_api_ical');
module_load_include('inc', 'date_repeat', 'date_repeat_calc');
list($rrule, $exceptions, $additions) = date_repeat_split_rrule($event['rrule']);
// Add the rrule itself. We need to massage the data a bit, since iCalcreator expects RRULEs to be
// in a different format than the Date API gives them to us.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment