1 files changed, 19 insertions, 19 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 0cd6784fd8..bc3d8d5e52 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -2,22 +2,18 @@ module ActionView #:nodoc:
   class Template #:nodoc:
 
     attr_accessor :locals
-    attr_reader :handler, :path, :source, :extension, :filename, :path_without_extension, :method
+    attr_reader :handler, :path, :extension, :filename, :path_without_extension, :method
 
-    def initialize(view, path_or_source, use_full_path, locals = {}, inline = false, inline_type = nil)
+    def initialize(view, path, use_full_path, locals = {})
       @view = view
       @finder = @view.finder
 
-      unless inline
-        # Clear the forward slash at the beginning if exists
-        @path = use_full_path ? path_or_source.sub(/^\//, '') : path_or_source
-        @view.first_render ||= @path
-        @source = nil # Don't read the source until we know that it is required
-        set_extension_and_file_name(use_full_path)
-      else
-        @source = path_or_source
-        @extension = inline_type
-      end
+      # Clear the forward slash at the beginning if exists
+      @path = use_full_path ? path.sub(/^\//, '') : path
+      @view.first_render ||= @path
+      @source = nil # Don't read the source until we know that it is required
+      set_extension_and_file_name(use_full_path)
+      
       @locals = locals || {}
       @handler = self.class.handler_class_for_extension(@extension).new(@view)
     end
@@ -32,7 +28,7 @@ module ActionView #:nodoc:
     end
 
     def method_key
-      @method_key ||= (@filename || @source)
+      @filename
     end
 
     def base_path_for_exception
@@ -58,9 +54,8 @@ module ActionView #:nodoc:
           @filename = @finder.pick_template(@path_without_extension, @extension)
         else
           @extension = @finder.pick_template_extension(@path).to_s
-          unless @extension
-            raise ActionViewError, "No template found for #{@path} in #{@finder.view_paths.inspect}"
-          end
+          raise_missing_template_exception unless @extension
+          
           @filename = @finder.pick_template(@path, @extension)
           @extension = @extension.gsub(/^.+\./, '') # strip off any formats
         end
@@ -68,9 +63,14 @@ module ActionView #:nodoc:
         @filename = @path
       end
 
-      if @filename.blank?
-        raise ActionViewError, "Couldn't find template file for #{@path} in #{@finder.view_paths.inspect}"
-      end
+      raise_missing_template_exception if @filename.blank?
+    end
+    
+    def raise_missing_template_exception
+      full_template_path = @path.include?('.') ? @path : "#{@path}.#{@view.template_format}.erb"
+      display_paths = @finder.view_paths.join(':')
+      template_type = (@path =~ /layouts/i) ? 'layout' : 'template'
+      raise(MissingTemplate, "Missing #{template_type} #{full_template_path} in view path #{display_paths}")
     end
 
     # Template Handlers