oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging bugfixes from branch to head

Browse source
This commit is contained in:
Roy Johnson 2006-11-02 02:29:27 +00:00
parent 7571dbca39
commit d4a5320e0a
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -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;

2
lib/WebGUI/Storage.pm
View file

@ -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");