Merge branch 'master' into development

This commit is contained in:
Godwin 2017-08-12 11:25:48 -07:00 committed by GitHub
commit d336a7cc60

View File

@ -366,7 +366,7 @@ class WorkshopsController < ApplicationController
@page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details" @page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
@main_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Register" @main_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Register"
@main_title_vars = { vars: { title: @this_conference.title } } @main_title_vars = { vars: { title: @this_conference.title } }
render register_path(@this_conference.slug) render 'conferences/register'
end end
end end