From 377386f23904d95d4ba684a21aa03fefd852a1bb Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Thu, 29 Nov 2007 15:50:56 +0000 Subject: [PATCH] Merged revisions 5062 via svnmerge from https://svn.webgui.org/plainblack/branch/WebGUI_7.4 ........ r5062 | graham | 2007-11-29 09:45:32 -0600 (Thu, 29 Nov 2007) | 1 line fix: double width characters encoded incorrectly in Collaboration RSS feed ........ --- docs/changelog/7.x.x.txt | 3 +++ lib/WebGUI/Asset/RSSFromParent.pm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 652c66088..2706a633b 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -9,6 +9,9 @@ (Diona Kidd, Knowmad Technologies) - rfe: Add menuTitle to folder template (perlDreamer Consulting, LLC) +7.4.17 + - fix: double width characters encoded incorrectly in Collaboration RSS feed + 7.4.16 - fix: Event End Time Missing (perlDreamer Consulting, LLC.) http://www.plainblack.com/bugs/tracker/event-end-time-missing diff --git a/lib/WebGUI/Asset/RSSFromParent.pm b/lib/WebGUI/Asset/RSSFromParent.pm index 97224e80a..c64c3d3d0 100644 --- a/lib/WebGUI/Asset/RSSFromParent.pm +++ b/lib/WebGUI/Asset/RSSFromParent.pm @@ -15,6 +15,7 @@ package WebGUI::Asset::RSSFromParent; =cut use strict; +use Encode; use HTML::Entities; use Tie::IxHash; use base 'WebGUI::Asset'; @@ -69,6 +70,7 @@ sub update { sub _escapeXml { my $text = shift; return $text unless (ref $text eq ""); + $text = decode('utf8', $text); return HTML::Entities::encode_numeric($text) }