]> git.deb.at Git - pkg/blosxom.git/blobdiff - blosxom.cgi
projects / pkg / blosxom.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add hash/hashref interpolation support to blosxom.cgi, and tests.
[pkg/blosxom.git] / blosxom.cgi
diff --git a/blosxom.cgi b/blosxom.cgi
index 685274659872314cbbbcd98707fa035354413a0a..4e19e64a27e20e423427d02a3fdf93045d616553 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -510,10 +510,10 @@ sub generate {
 
     # Define default interpolation subroutine
     $interpolate = sub {
-
         package blosxom;
         my $template = shift;
-        $template =~ s/(\$\w+(?:::\w+)*)/"defined $1 ? $1 : ''"/gee;
+        # Interpolate scalars, namespaced scalars, and hash/hashref scalars
+        $template =~ s/(\$\w+(?:::\w+)*(?:(?:->)?{(['"]?)[-\w]+\2})?)/"defined $1 ? $1 : ''"/gee;
         return $template;
     };
 
@@ -726,7 +726,7 @@ html content_type text/html; charset=$blog_encoding
 html head <html>
 html head     <head>
 html head         <meta http-equiv="content-type" content="text/html;charset=$blog_encoding" />
-html head         <link rel="alternate" type="type="application/rss+xml" title="RSS" href="$url/index.rss" />
+html head         <link rel="alternate" type="application/rss+xml" title="RSS" href="$url/index.rss" />
 html head         <title>$blog_title $path_info_da $path_info_mo $path_info_yr
 html head         </title>
 html head     </head>