Avoid "conditional and" for setting $hr12

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

diff --git a/blosxom.cgi b/blosxom.cgi
index 0c483e9c4c5b17e7fc3a530c3a4cb7373664567d..fd8124a60f853f4740d7173e952d83b5a5bdb842 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -388,7 +388,11 @@ else {
 }
 
 # Plugins: End
-foreach my $plugin ( @plugins ) { $plugins{$plugin} > 0 and $plugin->can('end') and $entries = $plugin->end() }
+foreach my $plugin (@plugins) {
+    if ( $plugins{$plugin} > 0 and $plugin->can('end') ) {
+        $entries = $plugin->end();
+    }
+}
 
 # Generate 
 sub generate {
@@ -500,7 +504,7 @@ sub generate {
       ($dw,$mo,$mo_num,$da,$ti,$yr,$utc_offset) = nice_date($files{"$path_file"});
       ($hr,$min) = split /:/, $ti;
       ($hr12, $ampm) = $hr >= 12 ? ($hr - 12,'pm') : ($hr, 'am'); 
-      $hr12 =~ s/^0//; $hr12 == 0 and $hr12 = 12;
+      $hr12 =~ s/^0//; if ($hr12 == 0) {$hr12 = 12};
   
       # Only stories from the right date
       my($path_info_yr,$path_info_mo_num, $path_info_da) = split /\//, $date;