Merge remote-tracking branch 'upstream/pull/2473'

[rails.git] / app / helpers / banner_helper.rb

diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb
index 4e888173b34ca0e127ff4574239413d9a6b26792..fef6eaa5e77c989c177eb0c15aed84687c844fbf 100644 (file)
--- a/app/helpers/banner_helper.rb
+++ b/app/helpers/banner_helper.rb
@@ -4,7 +4,7 @@ module BannerHelper
       enddate = v[:enddate]
       begin
         parsed = enddate && Date.parse(enddate)
       enddate = v[:enddate]
       begin
         parsed = enddate && Date.parse(enddate)

-      rescue
+      rescue StandardError

         parsed = nil
       end
       !parsed.is_a?(Date) || (parsed.is_a?(Date) && parsed.past?)
         parsed = nil
       end
       !parsed.is_a?(Date) || (parsed.is_a?(Date) && parsed.past?)


@@ -26,7 +26,7 @@ module BannerHelper
 
       # rotate all banner queue positions
       index = cval.to_i
 
       # rotate all banner queue positions
       index = cval.to_i

-      cookies[ckey] = index - 1 if index > 0
+      cookies[ckey] = index - 1 if index.positive?

 
       # pick banner with mininum queue position
       next if index > min_index
 
       # pick banner with mininum queue position
       next if index > min_index