Merge branch 'master' into WebGUI8

2010-04-13 07:50:02 -05:00 · 2010-04-13 07:50:02 -05:00 · 2400f19099
commit 2400f19099
parent e8d196c020 88e8fe77fb
797 changed files with 33894 additions and 27196 deletions
--- a/lib/WebGUI/Asset/Story.pm
+++ b/lib/WebGUI/Asset/Story.pm
@ -504,7 +504,7 @@ sub getRssData {
 	my $self = shift;
    my $data = {
        title       => $self->headline || $self->getTitle,
-        description => $self->subtitle,
+        description => $self->story,
        'link'      => $self->getUrl,
        author      => $self->byline,
        date        => $self->lastModified,