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 e6d09f18d787b3b1d436bda46ac21f76cb6defb1..5e77b66910019eb0c5702f61cdd550d7d3a4ff7d 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -32,7 +32,7 @@ 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