diff options
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/template/resolver.rb | 4 | ||||
| -rw-r--r-- | actionview/lib/action_view/testing/resolvers.rb | 4 | 
2 files changed, 4 insertions, 4 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb index f2b8b1166d..1dc9c9919a 100644 --- a/actionview/lib/action_view/template/resolver.rb +++ b/actionview/lib/action_view/template/resolver.rb @@ -212,7 +212,7 @@ module ActionView          template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed          template_paths.map do |template| -          handler, format, variant = extract_handler_and_format_and_variant(template, formats.first) +          handler, format, variant = extract_handler_and_format_and_variant(template)            FileTemplate.new(File.expand_path(template), handler,              virtual_path: path.virtual, @@ -280,7 +280,7 @@ module ActionView        # Extract handler, formats and variant from path. If a format cannot be found neither        # from the path, or the handler, we should return the array of formats given        # to the resolver. -      def extract_handler_and_format_and_variant(path, query_format) +      def extract_handler_and_format_and_variant(path)          pieces = File.basename(path).split(".")          pieces.shift diff --git a/actionview/lib/action_view/testing/resolvers.rb b/actionview/lib/action_view/testing/resolvers.rb index 2305fc9b81..3ca8420c6c 100644 --- a/actionview/lib/action_view/testing/resolvers.rb +++ b/actionview/lib/action_view/testing/resolvers.rb @@ -34,7 +34,7 @@ module ActionView #:nodoc:          @hash.each do |_path, array|            source, updated_at = array            next unless query.match?(_path) -          handler, format, variant = extract_handler_and_format_and_variant(_path, :html) +          handler, format, variant = extract_handler_and_format_and_variant(_path)            templates << Template.new(source, _path, handler,              virtual_path: path.virtual,              format: format, @@ -50,7 +50,7 @@ module ActionView #:nodoc:    class NullResolver < PathResolver      def query(path, exts, _, _, locals) -      handler, format, variant = extract_handler_and_format_and_variant(path, :html) +      handler, format, variant = extract_handler_and_format_and_variant(path)        [ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: format, variant: variant, locals: locals)]      end    end  | 
