Fixed nil object error on Meals page

2016-07-18 10:18:55 -07:00 · 2016-07-18 10:18:55 -07:00 · be50d165b3
commit be50d165b3
parent 310f2f3d46
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@ -804,7 +804,7 @@ class ConferencesController < ApplicationController
 				@time = nil
 				@length = 1.5
 			when :meals
-				@meals = Hash[@this_conference.meals.map{ |k, v| [k.to_i, v] }].sort.to_h
+				@meals = Hash[(@this_conference.meals || {}).map{ |k, v| [k.to_i, v] }].sort.to_h
 			when :workshop_times
 				get_block_data
 				@workshop_blocks << {