From 8b23a6e7cfc915956c6ac955781e525abc3a94d2 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Wed, 7 Nov 2007 18:53:40 +0000 Subject: [PATCH] fix backslash doubling on ical import --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index cf21741bf..2460745bb 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -9,6 +9,7 @@ (Diona Kidd, Knowmad Technologies) 7.4.13 +- fix: Calendar doubles backslashes on iCal import - fix: EMS edit badge event list can display incorrectly in IE - fix: Expired SessionScratch not deleted (thanks to Michelle Lamar) http://www.plainblack.com/bugs/tracker/expired-sessionscratch-not-deleted diff --git a/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm b/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm index e59ee7edd..a2b1e6d99 100755 --- a/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm +++ b/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm @@ -200,8 +200,8 @@ sub execute { my $properties = { feedUid => $id, feedId => $feed->{feedId}, - description => $events{$id}->{description}->[1], - title => $events{$id}->{summary}->[1], + description => _unwrapIcalText($events{$id}->{description}->[1]), + title => _unwrapIcalText($events{$id}->{summary}->[1]), menuTitle => substr($events{$id}->{summary}->[1],0,15), className => 'WebGUI::Asset::Event', isHidden => 1, @@ -507,6 +507,11 @@ sub _icalToMySQL { )->toMysql; } +sub _unwrapIcalText { + my $text = shift; + $text =~ s/\\([.;\\])/$1/g; + return $text; +} =head1 BUGS