From 08581a0c4af9055a406ea11c401584ece08d3c2d Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Fri, 31 Oct 2014 17:25:57 -0200 Subject: [PATCH] SearchController: avoid invalid dates --- app/controllers/public/search_controller.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb index eae18f7..b63fdc7 100644 --- a/app/controllers/public/search_controller.rb +++ b/app/controllers/public/search_controller.rb @@ -90,10 +90,14 @@ class SearchController < PublicController end def events - year = (params[:year] ? params[:year].to_i : Date.today.year) - month = (params[:month] ? params[:month].to_i : Date.today.month) - day = (params[:day] ? params[:day].to_i : Date.today.day) - @date = build_date(year, month, day) + if params[:year].blank? && params[:year].blank? && params[:day].blank? + @date = Date.today + else + year = (params[:year] ? params[:year].to_i : Date.today.year) + month = (params[:month] ? params[:month].to_i : Date.today.month) + day = (params[:day] ? params[:day].to_i : 1) + @date = build_date(year, month, day) + end date_range = (@date - 1.month).at_beginning_of_month..(@date + 1.month).at_end_of_month @events = [] -- libgit2 0.21.2