r4487@asus: jeremy | 2006-04-29 12:21:39 -0700

 Check whether @flash is defined? for warnings-safety.
 r4488@asus:  jeremy | 2006-04-29 12:23:15 -0700
 Check whether @flash is defined? for warnings-safety. Obviates nil? check.
 r4489@asus:  jeremy | 2006-04-29 12:45:18 -0700
 Check whether @session is defined? for warnings-safety.
 r4490@asus:  jeremy | 2006-04-29 12:50:41 -0700
 Check whether @rendering_runtime is defined? for warnings-safety.
 r4491@asus:  jeremy | 2006-04-29 12:55:01 -0700
 Check whether @_cycles is defined? for warnings-safety.
 r4492@asus:  jeremy | 2006-04-29 12:59:19 -0700
 Check whether instance variables are defined? for warnings-safety.
 r4493@asus:  jeremy | 2006-04-29 13:14:09 -0700
 Add nil @template to PrototypeHelperTest to suppress unitialized instance variable warning.
 r4494@asus:  jeremy | 2006-04-29 13:31:34 -0700
 Check whether @auto_index defined? for warnings-safety.
 r4495@asus:  jeremy | 2006-04-29 13:32:24 -0700
 Wrap content_columns redefinitions with silence_warnings.
 r4496@asus:  jeremy | 2006-04-29 13:35:28 -0700
 Wrap more redefinitions with silence_warnings.
 r4829@asus:  jeremy | 2006-07-08 10:59:20 -0700
 abstract unit, fix warnings
 r4830@asus:  jeremy | 2006-07-08 11:06:12 -0700
 Use parens to silence warning.
 r4831@asus:  jeremy | 2006-07-08 11:06:48 -0700
 Use parens to silence warning.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4595 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 5 insertions, 6 deletions

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 286defa54e..eef7d1f567 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -267,7 +267,7 @@ module ActionView
         end
         options["checked"] = "checked" if checked
         pretty_tag_value    = tag_value.to_s.gsub(/\s/, "_").gsub(/\W/, "").downcase
-        options["id"]       = @auto_index ?             
+        options["id"]       = defined?(@auto_index) ?             
           "#{@object_name}_#{@auto_index}_#{@method_name}_#{pretty_tag_value}" :
           "#{@object_name}_#{@method_name}_#{pretty_tag_value}"
         add_default_name_and_id(options)
@@ -377,7 +377,7 @@ module ActionView
             options["name"] ||= tag_name_with_index(options["index"])
             options["id"]   ||= tag_id_with_index(options["index"])
             options.delete("index")
-          elsif @auto_index
+          elsif defined?(@auto_index)
             options["name"] ||= tag_name_with_index(@auto_index)
             options["id"]   ||= tag_id_with_index(@auto_index)
           else
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 2040c52a71..f668f09d34 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -277,8 +277,7 @@ module ActionView
       # the next time it is used.
       def reset_cycle(name = "default")
         cycle = get_cycle(name)
-        return if cycle.nil?
-        cycle.reset
+        cycle.reset unless cycle.nil?
       end
 
       class Cycle #:nodoc:
@@ -305,12 +304,12 @@ module ActionView
         # guaranteed to be reset every time a page is rendered, so it
         # uses an instance variable of ActionView::Base.
         def get_cycle(name)
-          @_cycles = Hash.new if @_cycles.nil?
+          @_cycles = Hash.new unless defined?(@_cycles)
           return @_cycles[name]
         end
         
         def set_cycle(name, cycle_object)
-          @_cycles = Hash.new if @_cycles.nil?
+          @_cycles = Hash.new unless defined?(@_cycles)
           @_cycles[name] = cycle_object
         end