Use send_data for GPX traces intead of monkey patching send_file

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index d3ed53c1bc040353d52d8b23884bf6decf13cd31..e418e103fdcd0cca186cd572c50b6ebb46779c83 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -99,7 +99,7 @@ class UserController < ApplicationController
                                        "lat" => m[2],
                                        "lon" => m[3] }.merge(editor))
             end
                                        "lat" => m[2],
                                        "lon" => m[3] }.merge(editor))
             end

-          rescue
+          rescue StandardError

             # Use default
           end
 
             # Use default
           end
 


@@ -723,7 +723,7 @@ class UserController < ApplicationController
 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now
 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now

-          rescue
+          rescue StandardError

             # Ignore errors sending email
           end
         else
             # Ignore errors sending email
           end
         else