File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed
actionview/lib/action_view Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -16,10 +16,14 @@ module ViewPaths
16
16
module ClassMethods
17
17
def _prefixes # :nodoc:
18
18
@_prefixes ||= begin
19
- deprecated_prefixes = handle_deprecated_parent_prefixes and return deprecated_prefixes
20
-
21
- return local_prefixes if superclass . abstract?
22
- local_prefixes + superclass . _prefixes
19
+ deprecated_prefixes = handle_deprecated_parent_prefixes
20
+ return deprecated_prefixes if deprecated_prefixes
21
+
22
+ if superclass . abstract?
23
+ local_prefixes
24
+ else
25
+ local_prefixes + superclass . _prefixes
26
+ end
23
27
end
24
28
end
25
29
@@ -33,6 +37,7 @@ def local_prefixes
33
37
34
38
def handle_deprecated_parent_prefixes # TODO: remove in 4.3/5.0.
35
39
return unless respond_to? ( :parent_prefixes )
40
+
36
41
ActiveSupport ::Deprecation . warn "Overriding ActionController::Base::parent_prefixes is deprecated, override .local_prefixes instead."
37
42
local_prefixes + parent_prefixes
38
43
end
You can’t perform that action at this time.
0 commit comments