X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8b9b6dd58cf049acc6cf647f80ceb5e3e200cd6..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/helpers/application_helper.rb?ds=sidebyside diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ed01ad89b..bb09f3a49 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,7 +30,7 @@ module ApplicationHelper end def friendly_date_ago(date) - tag.span(time_ago_in_words(date, :scope => :'datetime.distance_in_words_ago'), :title => l(date, :format => :friendly)) + tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly)) end def body_class @@ -58,14 +58,20 @@ module ApplicationHelper end data[:location] = session[:location] if session[:location] - - if oauth_token - data[:token] = oauth_token.token - data[:token_secret] = oauth_token.secret - data[:consumer_key] = oauth_token.client_application.key - data[:consumer_secret] = oauth_token.client_application.secret - end + data[:oauth_token] = oauth_token.token if oauth_token data end + + # If the flash is a hash, then it will be a partial with a hash of locals, so we can call `render` on that + # This allows us to render html into a flash message in a safe manner. + def render_flash(flash) + if flash.is_a?(Hash) + render flash.with_indifferent_access + else + flash + end + rescue StandardError + flash.inspect if Rails.env.development? + end end