Show a message when no features are found

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 67e25c6a7b86520bb1526f0ef8236e897f984bab..3830df88bf40fb9b117af17b2d1d27804f821be8 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -419,7 +419,7 @@ class ApplicationController < ActionController::Base
   end
 
   def map_layout
   end
 
   def map_layout

-    request.xhr? ? false : 'map'
+    request.xhr? ? 'xhr' : 'map'

   end
 
   def preferred_editor
   end
 
   def preferred_editor


@@ -431,7 +431,7 @@ class ApplicationController < ActionController::Base
       DEFAULT_EDITOR
     end
 
       DEFAULT_EDITOR
     end
 

-    if request.env['HTTP_USER_AGENT'] =~ /MSIE/ and editor == 'id'
+    if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/ and editor == 'id'

       editor = 'potlatch2'
     end
 
       editor = 'potlatch2'
     end