diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 3be57f347..c6d477917 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -47,6 +47,8 @@ - Fixed a bug that could cause package imports to fail if they included updated revisions of existing assets. This fix may also prevent other revisionDate related errors, though none are known at this time. + - fix: Error in Storage.pm + - fix: Relative URL in viewRSS function of CS 7.1.2 - Fixed a bug where logging in/out would cause a blank page display. diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 83863b188..7995bc4ba 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -1176,7 +1176,8 @@ sub www_viewRSS { $self->logView() if ($self->session->setting->get("passiveProfilingEnabled")); # Set the required channel variables $var{'title'} = _xml_encode($self->get("title")); - $var{'link'} = _xml_encode($self->getUrl); + $var{'link'} = _xml_encode($self->session->url->getSiteURL().$self->getUrl); + $self->session->errorHandler->warn( $var{'link'} ); $var{'description'} = _xml_encode($self->get("description")); # Set some of the optional channel variables $var{'generator'} = "WebGUI ".$WebGUI::VERSION; @@ -1199,7 +1200,6 @@ sub www_viewRSS { while (my ($id, $class, $version) = $sth->array) { my $post = WebGUI::Asset::Wobject::Collaboration->new($self->session, $id, $class, $version); my $encUrl = _xml_encode($self->session->url->getSiteURL().$post->getUrl); - my @attachmentLoop = (); unless ($post->get("storageId") eq "") { my $storage = $post->getStorageLocation; diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm index f4fd359c7..270996570 100644 --- a/lib/WebGUI/Storage.pm +++ b/lib/WebGUI/Storage.pm @@ -540,7 +540,7 @@ sub getFileIconUrl { my $filename = shift; my $extension = $self->getFileExtension($filename); my $path = $self->session->config->get("extrasPath").'/fileIcons/'.$extension.".gif"; - if (-e $path) { + if (-e $path && $extension) { return $self->session->url->extras("fileIcons/".$extension.".gif"); } return $self->session->url->extras("fileIcons/unknown.gif");