@@ -95,7 +95,7 @@ module Merb::RenderMixin thing ||= action_name.to_sym # Content negotiation - opts[:format] ? (self.content_type = opts[:format]) : content_type + self.content_type = opts[:format] if opts[:format] # Handle options (:status) _handle_options!(opts) lib/merb-core/controller/mixins/render.rb dede45e06d205ba40590f065b169d31a5b3ef828 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/3b6a8d5fdf5040cbb17890260e3a8fe67acf8b21 3b6a8d5fdf5040cbb17890260e3a8fe67acf8b21 2008-09-06T04:36:50-07:00 2008-09-06T04:20:00-07:00 Simplify one more clever line. b0279a802d09d7284e6162dce3de5d488ddd0bfd Michael S. Klishin michael@novemberain.com