Merge remote branch 'apmon/openID' into openID

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 98075b8f810d40bf9cdd6faf8012095e4d0aed3f..4b539b1fdc879207eca038bdfe59e31be2b429ff 100644 (file)
--- 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]
 
   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|
       if request.post?
         any_auth = false
         @token.client_application.permissions.each do |pref|