From b3fc5add347a613009035e1f2376080328732b51 Mon Sep 17 00:00:00 2001 From: Patrick Morgan Date: Wed, 14 Sep 2011 13:39:11 -0500 Subject: [PATCH] Correct "return cant jump across threads" error when using check_authorization() --- lib/cancan/controller_additions.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cancan/controller_additions.rb b/lib/cancan/controller_additions.rb index 12e0875..0d293a3 100644 --- a/lib/cancan/controller_additions.rb +++ b/lib/cancan/controller_additions.rb @@ -247,9 +247,9 @@ module CanCan # def check_authorization(options = {}) self.after_filter(options.slice(:only, :except)) do |controller| - return if controller.instance_variable_defined?(:@_authorized) - return if options[:if] && !controller.send(options[:if]) - return if options[:unless] && controller.send(options[:unless]) + next if controller.instance_variable_defined?(:@_authorized) + next if options[:if] && !controller.send(options[:if]) + next if options[:unless] && controller.send(options[:unless]) raise AuthorizationNotPerformed, "This action failed the check_authorization because it does not authorize_resource. Add skip_authorization_check to bypass this check." end end