templates.rb in mojito-0.2.3

- old
+ new

@@ -6,24 +6,22 @@
 		require 'tilt'
 		require 'where'
 		require 'mime/types'
 		
 		def template(*args, &block)
-			locals = Hash === args.last ? args.pop : self.locals
+			locals = Hash === args.last ? args.pop : self.request.locals
 			template = if args.size == 2
 				Tilt[args.first].new { args.last }
 			elsif args.size == 1
 				file = Where.cdir(1) + args.first
 				Mojito::R::StatusCodes.instance_method(:not_found!).bind(self).call unless file.exist?
-				if %r{\.(?<extension>\w+)\.\w+$} =~ file.to_s
+				if not response.include?('Content-Type') and %r{\.(?<extension>\w+)\.\w+$} =~ file.to_s
 					response['Content-Type'] = MIME::Types.type_for(extension)
 				end
 				Tilt[file.to_s].new file.to_s
 			end
 			response.write template.render(self, locals, &block)
 		end
 		
 	end
 	
-	Mojito::PLUGINS[:templates] = Templates
-
 end
\ No newline at end of file