Use current_user to represent the currently logged in user.

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index c36ded1c0bff58123ab690b2bc754dc557a48728..9324a8ed56a4c4eb2351123a0c7d677ce56fd894 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -305,7 +305,7 @@ class ApiController < ApplicationController
   def permissions
     @permissions = if current_token.present?
                      ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) }
-                   elsif @user
+                   elsif current_user
                      ClientApplication.all_permissions
                    else
                      []