X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aa1fb6dbb8c2e71b8ce8c231ae1272a2dfebd75a..20ce10a9ef722cc95402ad2e488b56f32f8169e1:/app/views/site/_potlatch2.html.erb?ds=sidebyside diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index 9e01eef30..1ff16eac0 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -1,13 +1,13 @@ <%= javascript_include_tag "edit/potlatch2" %>
- <% session[:token] = current_user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%> + <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by(:token => session[:token]) -%> <% data = { :token => session[:token] } -%> <% data[:lat] = @lat if @lat -%> <% data[:lon] = @lon if @lon -%> <% data[:zoom] = @zoom if @zoom -%> - <% if defined? POTLATCH2_KEY %> - <% token = current_user.access_token(POTLATCH2_KEY) %> + <% if Settings.key?(:potlatch2_key) %> + <% token = current_user.access_token(Settings.potlatch2_key) %> <% data[:token] = token.token -%> <% data[:token_secret] = token.secret -%> <% data[:consumer_key] = token.client_application.key -%> @@ -15,5 +15,5 @@ <% end %> <% data[:locale] = Locale.list(Potlatch2::LOCALES.keys).preferred(preferred_languages).to_s -%> <% data[:locale_path] = asset_path("potlatch2/locales/#{Potlatch2::LOCALES[data[:locale]]}.swf") -%> - <%= content_tag :div, raw(t("site.edit.flash_player_required")), :id => "potlatch", :data => data %> + <%= tag.div t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>