From: Barijaona Ramaholimihaso <barijaona@users.sourceforge.net>
Date: Thu, 27 Sep 2007 11:25:21 +0000 (+0000)
Subject: Allows default interpolate routine to handle multiple :: in variable names.
X-Git-Tag: v2_1_0~44
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fblosxom.git;a=commitdiff_plain;h=70ac0fad278c1b701df7c3613d27c6b76104dfbd;hp=3965f3e5f1d327b951bf946120d5598a594d4b8c

Allows default interpolate routine to handle multiple :: in variable names.
---

diff --git a/blosxom.cgi b/blosxom.cgi
index e57ab4b..78ad2ff 100755
--- 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;
 
-    $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,
@@ -506,7 +506,7 @@ sub generate {
 
         package blosxom;
         my $template = shift;
-        $template =~ s/(\$\w+(?:::)?\w*)/"defined $1 ? $1 : ''"/gee;
+        $template =~ s/(\$\w+(?:::\w+)*)/"defined $1 ? $1 : ''"/gee;
         return $template;
     };