Merge branch 'master' into WebGUI8

This commit is contained in:
Graham Knop 2010-04-13 07:50:02 -05:00
commit 2400f19099
797 changed files with 33894 additions and 27196 deletions

View file

@ -459,7 +459,7 @@ sub getFeed {
$feed->description( $self->feedDescription || $self->synopsis );
$feed->pubDate( $self->getContentLastModified );
$feed->copyright( $self->feedCopyright );
$feed->link( $self->getUrl );
$feed->link( $self->session->url->getSiteURL . $self->getUrl );
# $feed->language( $lang );
if ($self->feedImage) {
my $storage = WebGUI::Storage->get($self->session, $self->feedImage);