Changeset 1249
- Timestamp:
- 01/09/08 19:06:19 (9 months ago)
- Files:
-
- trunk/lib/merb/dispatcher.rb (modified) (1 diff)
- trunk/lib/merb/mixins/render.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/merb/dispatcher.rb
r1228 r1249 30 30 raise ControllerExceptions::BadRequest, "Route matched, but route did not specify a controller" 31 31 end 32 Merb.logger. debug("Routed to: #{request.route_params.inspect}")32 Merb.logger.debug("Routed to: #{request.route_params.inspect}") 33 33 # set controller class and the action to call 34 34 klass = request.controller_class trunk/lib/merb/mixins/render.rb
r1228 r1249 13 13 14 14 self._layout = :application 15 self._template_root = File.expand_path(Merb. view_path)15 self._template_root = File.expand_path(Merb.view_path) 16 16 self._templates = {} 17 17 self._cached_partials = {}
