From 7bcd66e44942013729e9f6a6f6c771b1d8c7095d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 14 May 2014 13:45:20 -0300 Subject: Refactoring the code to make consitional return explicit --- actionview/lib/action_view/view_paths.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'actionview/lib/action_view/view_paths.rb') diff --git a/actionview/lib/action_view/view_paths.rb b/actionview/lib/action_view/view_paths.rb index 1c1d90dfd8..e341c11c73 100644 --- a/actionview/lib/action_view/view_paths.rb +++ b/actionview/lib/action_view/view_paths.rb @@ -16,10 +16,14 @@ module ActionView module ClassMethods def _prefixes # :nodoc: @_prefixes ||= begin - deprecated_prefixes = handle_deprecated_parent_prefixes and return deprecated_prefixes - - return local_prefixes if superclass.abstract? - local_prefixes + superclass._prefixes + deprecated_prefixes = handle_deprecated_parent_prefixes + return deprecated_prefixes if deprecated_prefixes + + if superclass.abstract? + local_prefixes + else + local_prefixes + superclass._prefixes + end end end @@ -33,6 +37,7 @@ module ActionView def handle_deprecated_parent_prefixes # TODO: remove in 4.3/5.0. return unless respond_to?(:parent_prefixes) + ActiveSupport::Deprecation.warn "Overriding ActionController::Base::parent_prefixes is deprecated, override .local_prefixes instead." local_prefixes + parent_prefixes end -- cgit v1.2.3