Merge branch 'master' into fix-sponsor-caching

app/controllers/conferences_controller.rb

@@ -20,6 +20,11 @@ class ConferencesController < ApplicationController
     authorize! :show, @conference # TODO: reduce the 10 queries performed here
 
     splashpage = @conference.splashpage
+
+    unless splashpage.present?
+      redirect_to admin_conference_splashpage_path(@conference.short_title) && return
+    end
+
     if splashpage.include_cfp
       cfps = @conference.program.cfps
       @call_for_events = cfps.find { |call| call.cfp_type == 'events' }