Link from a diary entry to the relevant user's diary

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 260f9ecfe5d659e69a13091d68f88611ddb4d52f..5c84be0cf4c27cb9c073dda4b3eae678ea8705bd 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -1,5 +1,5 @@
 class OauthController < ApplicationController
-  layout 'site'
+  layout 'slim'
 
   before_filter :authorize_web, :only => [:oauthorize, :revoke]
   before_filter :set_locale, :only => [:oauthorize, :revoke]
@@ -57,7 +57,7 @@ class OauthController < ApplicationController
           else
             redirect_url = @token.oob? ? @token.client_application.callback_url : @token.callback_url
           end
-          if redirect_url
+          if redirect_url and not redirect_url.empty?
             if @token.oauth10?
               redirect_to "#{redirect_url}?oauth_token=#{@token.token}"
             else