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

merging 7.1.4 changes

Browse source
This commit is contained in:
JT Smith 2006-11-03 04:36:13 +00:00
parent 3d878c09c7
commit aeba6ec83c
18 changed files with 92 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/WebGUI/Asset.pm
View file

@ -869,11 +869,11 @@ sub getNotFound {
my $session = shift;
if ($session->url->getRequestedUrl eq "*give-credit-where-credit-is-due*") {
my $content = "";
open(FILE,"<".$session->config->getWebguiRoot."/docs/credits.txt");
while (<FILE>) {
open(my $FILE,"<",$session->config->getWebguiRoot."/docs/credits.txt");
while (<$FILE>) {
$content .= $_;
}
close(FILE);
close($FILE);
return WebGUI::Asset->newByPropertyHashRef($session,{
className=>"WebGUI::Asset::Snippet",
snippet=> '<pre>'.$content.'</pre>'
@ -1680,7 +1680,10 @@ sub processTemplate {
my $template = shift;
$template = WebGUI::Asset->new($self->session, $templateId,"WebGUI::Asset::Template") unless (defined $template);
if (defined $template) {
my $meta = $self->getMetaDataFields() if ($self->session->setting->get("metaDataEnabled"));
my $meta = {};
if ($self->session->setting->get("metaDataEnabled")) {
$meta = $self->getMetaDataFields();
}
foreach my $field (keys %$meta) {
$var->{$meta->{$field}{fieldName}} = $meta->{$field}{value};
}