Avoid "conditional and" for testing if $date should be added to $output

[matthijs/upstream/blosxom.git] / blosxom.cgi

diff --git a/blosxom.cgi b/blosxom.cgi
index 2875b44a6b8917df9f5c4789bf14c44d2a9523ef..ee085a38503133baeabd150cff5e7d849500f66d 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -505,11 +505,20 @@ sub generate {
       my $date = (&$template($path,'date',$flavour));
       
       # Plugins: Date
-      foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('date') and $entries = $plugin->date($currentdir, \$date, $files{$path_file}, $dw,$mo,$mo_num,$da,$ti,$yr) }
+      foreach my $plugin (@plugins) {
+          if ( $plugins{$plugin} > 0 and $plugin->can('date') ) {
+              $entries
+                  = $plugin->date( $currentdir, \$date, $files{$path_file}, $dw,
+                  $mo, $mo_num, $da, $ti, $yr );
+          }
+      }
   
       $date = &$interpolate($date);
   
-      $curdate ne $date and $curdate = $date and $output .= $date;
+      if ( $date && $curdate ne $date ) {
+          $curdate = $date;
+          $output .= $date;
+      }
       
       use vars qw/ $title $body $raw /;
       if (-f "$path_file" && $fh->open("< $path_file")) {