Merge branch 'master' into openstreetbugs

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

diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb
index 8412d17f37496f0192cd49645de7d685b66cb24c..41881cfb79577ed0dc1a46b10e95de9bfccc3063 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -214,10 +214,11 @@ class MapBugsController < ApplicationController
         else 
           conditions = ['false'] 
         end 
         else 
           conditions = ['false'] 
         end 

-      elsif request.format == :html 
+      else #if request.format == :html 

         @title = t 'user.no_such_user.title' 
         @not_found_user = params[:display_name] 
         render :template => 'user/no_such_user', :status => :not_found 
         @title = t 'user.no_such_user.title' 
         @not_found_user = params[:display_name] 
         render :template => 'user/no_such_user', :status => :not_found 

+               return

       end 
     end
 
       end 
     end