From 69ab396f0846613e76e31a672ff47c80d2f5f9cf Mon Sep 17 00:00:00 2001
From: Matt Amos <zerebubuth@gmail.com>
Date: Tue, 1 Sep 2009 10:25:53 +0000
Subject: [PATCH 1/1] Fixed bug when oauthorizing with a token which no longer
 exists (merged 17416 from oauth branch).

---
 app/controllers/oauth_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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|
-- 
2.39.5