0
@@ -144,9 +144,10 @@ module Merb::RenderMixin
0
     if opts[:layout]
0
       # Look for the layout under the default layout directly. If it's not found, reraise
0
       # the TemplateNotFound error
0
-      (layout = Merb::Template.template_for(Merb.dir_for(:layout) / opts[:layout])) ||
0
-        (raise TemplateNotFound, "No layout found at #{Merb.dir_for(:layout)}/#{layout}")
0
-        
0
+      template = _template_location(opts[:layout], layout.index(".") ? content_type : nil, "layout")      
0
+      layout = Merb::Template.template_for(_template_root / template) ||
0
+        (raise TemplateNotFound, "No layout found at #{_template_root / template}.*")      
0
+              
0
       # If the layout was found, call it
0
       send(layout)
0
     
0
@@ -196,12 +197,11 @@ module Merb::RenderMixin
0
     layout = _layout.to_s if _layout    
0
     layout = layout.to_s if layout
0
     
0
-    template = _template_location(layout, layout.index(".") ? content_type : nil, "layout")
0
-
0
     # If a layout was provided, throw an error if it's not found
0
     if layout
0
+      template = _template_location(layout, layout.index(".") ? content_type : nil, "layout")      
0
       Merb::Template.template_for(_template_root / template) ||
0
-        (raise TemplateNotFound, "No layout found at #{_template_root / template}")
0
+        (raise TemplateNotFound, "No layout found at #{_template_root / template}.*")
0
     
0
     # If a layout was not provided, try the default locations
0
     else