X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fblosxom.git;a=blobdiff_plain;f=blosxom.cgi;h=7c669dde565a2798204ff7179dd75d1183c54388;hp=e57ab4bd01bad5ce1fa117a1dc7f9b4d4bd1fbf3;hb=1bc93509a17fb06a9a0d5dd6b823a56d0c5d88aa;hpb=3965f3e5f1d327b951bf946120d5598a594d4b8c

diff --git a/blosxom.cgi b/blosxom.cgi
index e57ab4b..7c669dd 100755
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -251,8 +251,6 @@ my @plugin_list = ();
 my %plugin_hash = ();
 
 # If $plugin_list is set, read plugins to use from that file
-$plugin_list = "$config_dir/$plugin_list"
-    if $plugin_list && $plugin_list !~ m!^\s*/!;
 if ( $plugin_list and -r $plugin_list and $fh->open("< $plugin_list") ) {
     @plugin_list = map { chomp $_; $_ } grep { /\S/ && !/^#/ } <$fh>;
     $fh->close;
@@ -457,7 +455,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 +504,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;
     };
 
@@ -696,16 +694,16 @@ sub nice_date {
     my ($unixtime) = @_;
 
     my $c_time = CORE::localtime($unixtime);
-    my ( $dw, $mo, $da, $hr, $min, $yr )
+    my ( $dw, $mo, $da, $hr, $min, $sec, $yr )
         = ( $c_time
-            =~ /(\w{3}) +(\w{3}) +(\d{1,2}) +(\d{2}):(\d{2}):\d{2} +(\d{4})$/
+            =~ /(\w{3}) +(\w{3}) +(\d{1,2}) +(\d{2}):(\d{2}):(\d{2}) +(\d{4})$/
         );
     $ti = "$hr:$min";
     $da = sprintf( "%02d", $da );
     my $mo_num = $month2num{$mo};
 
     my $offset
-        = timegm( 00, $min, $hr, $da, $mo_num - 1, $yr - 1900 ) - $unixtime;
+        = timegm( $sec, $min, $hr, $da, $mo_num - 1, $yr - 1900 ) - $unixtime;
     my $utc_offset = sprintf( "%+03d", int( $offset / 3600 ) )
         . sprintf( "%02d", ( $offset % 3600 ) / 60 );