X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19a9298855028b3edb95428d34470f45c92ce8d9..3f8cf322723750aa4c8d062d4a727f9107ceccb4:/app/helpers/banner_helper.rb?ds=sidebyside diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb index 4e888173b..17c6eace3 100644 --- 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) - rescue + rescue StandardError parsed = nil end !parsed.is_a?(Date) || (parsed.is_a?(Date) && parsed.past?) @@ -26,9 +26,9 @@ module BannerHelper # 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 + # pick banner with minimum queue position next if index > min_index # or if equal queue position, pick banner with soonest end date (i.e. next expiring)