0
@@ -433,9 +433,12 @@
0
       # We separate the two maps because most of controllers will have
0
       # the same _template_root, so it's silly to be globbing the same
0
       # path over and over.
0
-      template_paths = Merb::AbstractController._abstract_subclasses.map do |klass|
0
-        Object.full_const_get(klass)._template_root
0
-      end.uniq.compact.map {|path| Dir["#{path}/**/*.#{extension_glob}"] }
0
+      controller_view_paths = []
0
+      Merb::AbstractController._abstract_subclasses.each do |klass|
0
+        next if (const = Object.full_const_get(klass))._template_root.blank?
0
+        controller_view_paths += const._template_roots.map { |pair| pair.first }
0
+      end
0
+      template_paths = controller_view_paths.uniq.compact.map { |path| Dir["#{path}/**/*.#{extension_glob}"] }
0
 
0
       # This gets the templates that might be created outside controllers
0
       # template roots.  eg app/views/shared/*