Revert "Name compiled render methods". This caused several failures o…

…n AP test suite for 1.9.2. This reverts commit 2c4f8aa.
rails · Jun 29, 2010 · 9013227 · 9013227
1 parent 093c4ee
commit 9013227
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
@@ -156,12 +156,11 @@ def counter_name
     end
 
     def inspect
-      @inspect ||=
+      if defined?(Rails.root)
-        if defined?(Rails.root)
+        identifier.sub("#{Rails.root}/", '')
-          identifier.sub("#{Rails.root}/", '')
+      else
-        else
+        identifier
-          identifier
+      end
-        end
     end
 
     private
@@ -268,11 +267,9 @@ def #{method_name}(local_assigns)
       end
 
       def build_method_name(locals)
-        @method_names[locals.keys.hash] ||= "#{identifier_method_name}__#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
+        # TODO: is locals.keys.hash reliably the same?
-      end
+        @method_names[locals.keys.hash] ||=
-
+          "_render_template_#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
-      def identifier_method_name
-        @identifier_method_name ||= inspect.gsub(/[^a-z_]/, '_')
       end
   end
 end