From: Matt Amos <zerebubuth@gmail.com>
Date: Tue, 1 Sep 2009 10:25:53 +0000 (+0000)
Subject: Fixed bug when oauthorizing with a token which no longer exists (merged 17416 from... 
X-Git-Tag: live~6744
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/69ab396f0846613e76e31a672ff47c80d2f5f9cf

Fixed bug when oauthorizing with a token which no longer exists (merged 17416 from oauth branch).
---

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 98075b8f8..4b539b1fd 100644
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -38,7 +38,7 @@ class OauthController < ApplicationController
 
   def oauthorize
     @token = RequestToken.find_by_token params[:oauth_token]
-    unless @token.invalidated?
+    unless @token.nil? or @token.invalidated? 
       if request.post?
         any_auth = false
         @token.client_application.permissions.each do |pref|