projects
/
matthijs
/
upstream
/
blosxom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f7240c
)
allow for empty (but defined) templates
author
Kevin Scaldeferri
<kscaldef@users.sourceforge.net>
Mon, 10 Jul 2006 20:34:08 +0000
(20:34 +0000)
committer
Kevin Scaldeferri
<kscaldef@users.sourceforge.net>
Mon, 10 Jul 2006 20:34:08 +0000
(20:34 +0000)
blosxom.cgi
patch
|
blob
|
history
diff --git
a/blosxom.cgi
b/blosxom.cgi
index 997fcc74a4a00fdc80eb0cd82265e8c64f850643..a979a0d29da750919f37b77998171717430dca21 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-143,13
+143,20
@@
$template =
return join '', <$fh> if $fh->open("< $datadir/$path/$chunk.$flavour");
} while ($path =~ s/(\/*[^\/]*)$// and $1);
return join '', <$fh> if $fh->open("< $datadir/$path/$chunk.$flavour");
} while ($path =~ s/(\/*[^\/]*)$// and $1);
- return join '', ($template{$flavour}{$chunk} || $template{error}{$chunk} || '');
+ # Check for definedness, since flavour can be the empty string
+ if (defined $template{$flavour}{$chunk}) {
+ return $template{$flavour}{$chunk};
+ } elsif (defined $template{error}{$chunk}) {
+ return $template{error}{$chunk}
+ } else {
+ return '';
+ }
};
# Bring in the templates
%template = ();
while (<DATA>) {
last if /^(__END__)$/;
};
# Bring in the templates
%template = ();
while (<DATA>) {
last if /^(__END__)$/;
- my($ct, $comp, $txt) = /^(\S+)\s(\S+)
\s(.*)
$/ or next;
+ my($ct, $comp, $txt) = /^(\S+)\s(\S+)
(?:\s(.*))?
$/ or next;
$txt =~ s/\\n/\n/mg;
$template{$ct}{$comp} .= $txt . "\n";
}
$txt =~ s/\\n/\n/mg;
$template{$ct}{$comp} .= $txt . "\n";
}