From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 Oct 2013 20:27:39 +0000 (+0100)
Subject: Fix server error when user#reset_password called with no token
X-Git-Tag: live~4705
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/078a9d8ee3058fe95e437b8597a22c97911e89c1

Fix server error when user#reset_password called with no token
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index a3d1b6e67..a9006e82b 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -198,6 +198,8 @@ class UserController < ApplicationController
         flash[:error] = t 'user.reset_password.flash token bad'
         redirect_to :action => 'lost_password'
       end
+    else
+      render :text => "", :status => :bad_request
     end
   end