Refactoring the code to make consitional return explicit
This commit is contained in:
parent
0af0ffde18
commit
7bcd66e449
@ -16,10 +16,14 @@ module ViewPaths
|
||||
module ClassMethods
|
||||
def _prefixes # :nodoc:
|
||||
@_prefixes ||= begin
|
||||
deprecated_prefixes = handle_deprecated_parent_prefixes and return deprecated_prefixes
|
||||
deprecated_prefixes = handle_deprecated_parent_prefixes
|
||||
return deprecated_prefixes if deprecated_prefixes
|
||||
|
||||
return local_prefixes if superclass.abstract?
|
||||
local_prefixes + superclass._prefixes
|
||||
if superclass.abstract?
|
||||
local_prefixes
|
||||
else
|
||||
local_prefixes + superclass._prefixes
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -33,6 +37,7 @@ def local_prefixes
|
||||
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user