Show a popup listing available editors when hovering over the edit tab

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index d08f34a0a29b0a2689e759c327b227896419f9a7..5e77b66910019eb0c5702f61cdd550d7d3a4ff7d 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -32,13 +32,11 @@ class SiteController < ApplicationController
   end
 
   def edit
-    editor = @user.preferred_editor || DEFAULT_EDITOR
+    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
 
     if editor == "josm"
       render :action => :index
     else
-      session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
-
       # Decide on a lat lon to initialise potlatch with. Various ways of doing this
       if params['lon'] and params['lat']
         @lon = params['lon'].to_f