0
@@ -1,5 +1,7 @@
0
 *1.12.1* (April 6th, 2005)
0
 
0
+* Fixed that template extensions would be cached development mode #4624 [Stefan Kaes]
0
+
0
 * Update to Prototype 1.5.0_rc0 [Sam Stephenson]
0
 
0
 * Honor skipping filters conditionally for only certain actions even when the parent class sets that filter to conditionally be executed only for the same actions. #4522 [Marcel Molina Jr.]

0
@@ -157,6 +157,11 @@
0
     @@cache_template_loading = false
0
     cattr_accessor :cache_template_loading
0
 
0
+    # Specify whether file extension lookup should be cached.
0
+    # Should be +false+ for development environments. Defaults to +true+.
0
+    @@cache_template_extensions = true
0
+    cattr_accessor :cache_template_extensions
0
+
0
     # Specify whether local_assigns should be able to use string keys.
0
     # Defaults to +true+. String keys are deprecated and will be removed
0
     # shortly.
0
@@ -312,15 +317,11 @@
0
     end
0
 
0
     def pick_template_extension(template_path)#:nodoc:
0
-      @@cached_template_extension[template_path] ||=
0
-        if match = delegate_template_exists?(template_path)
0
-          match.first.to_sym
0
-        elsif erb_template_exists?(template_path):        :rhtml
0
-        elsif builder_template_exists?(template_path):    :rxml
0
-        elsif javascript_template_exists?(template_path): :rjs
0
-        else
0
-          raise ActionViewError, "No rhtml, rxml, rjs or delegate template found for #{template_path}"
0
-        end
0
+      if @@cache_template_extensions
0
+        @@cached_template_extension[template_path] ||= find_template_extension_for(template_path)
0
+      else
0
+        find_template_extension_for(template_path)
0
+      end
0
     end
0
 
0
     def delegate_template_exists?(template_path)#:nodoc:
0
@@ -345,7 +346,7 @@
0
       if template_file_extension
0
         template_exists?(template_file_name, template_file_extension)
0
       else
0
-        @@cached_template_extension[template_path] ||
0
+        cached_template_extension(template_path) ||
0
            %w(erb builder javascript delegate).any? do |template_type| 
0
              send("#{template_type}_template_exists?", template_path)
0
            end
0
@@ -370,6 +371,21 @@
0
       def path_and_extension(template_path)
0
         template_path_without_extension = template_path.sub(/\.(\w+)$/, '')
0
         [ template_path_without_extension, $1 ]
0
+      end
0
+      
0
+      def cached_template_extension(template_path)
0
+        @@cache_template_extensions && @@cached_template_extension[template_path]
0
+      end      
0
+          
0
+      def find_template_extension_for(template_path)
0
+        if match = delegate_template_exists?(template_path)
0
+          match.first.to_sym
0
+        elsif erb_template_exists?(template_path):        :rhtml
0
+        elsif builder_template_exists?(template_path):    :rxml
0
+        elsif javascript_template_exists?(template_path): :rjs
0
+        else
0
+          raise ActionViewError, "No rhtml, rxml, rjs or delegate template found for #{template_path}"
0
+        end
0
       end
0
 
0
       # This method reads a template file.

0
@@ -14,6 +14,7 @@
0
 # Show full error reports and disable caching
0
 config.action_controller.consider_all_requests_local = true
0
 config.action_controller.perform_caching             = false
0
+config.action_view.cache_template_extensions         = false
0
 config.action_view.debug_rjs                         = true
0
 
0
 # Don't care if the mailer can't send