projects
/
matthijs
/
upstream
/
blosxom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allows default interpolate routine to handle multiple :: in variable names.
[matthijs/upstream/blosxom.git]
/
blosxom.cgi
diff --git
a/blosxom.cgi
b/blosxom.cgi
index e57ab4bd01bad5ce1fa117a1dc7f9b4d4bd1fbf3..78ad2ffcac7160a5cc41a5a1f62fc9c250ad19a3 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-457,7
+457,7
@@
else {
my $content_type = ( &$template( $path_info, 'content_type', $flavour ) );
$content_type =~ s!\n.*!!s;
my $content_type = ( &$template( $path_info, 'content_type', $flavour ) );
$content_type =~ s!\n.*!!s;
- $content_type =~ s/(\$\w+(?:::
)?\w
*)/"defined $1 ? $1 : ''"/gee;
+ $content_type =~ s/(\$\w+(?:::
\w+)
*)/"defined $1 ? $1 : ''"/gee;
$header = { -type => $content_type };
print generate( 'dynamic', $path_info,
$header = { -type => $content_type };
print generate( 'dynamic', $path_info,
@@
-506,7
+506,7
@@
sub generate {
package blosxom;
my $template = shift;
package blosxom;
my $template = shift;
- $template =~ s/(\$\w+(?:::
)?\w
*)/"defined $1 ? $1 : ''"/gee;
+ $template =~ s/(\$\w+(?:::
\w+)
*)/"defined $1 ? $1 : ''"/gee;
return $template;
};
return $template;
};