diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index ca9197ba8b..89c834dd47 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed all helpers so that they use XHTML compliant double quotes for values instead of single quotes [htonl/bitsweat]
+
* Added link_to_image(src, options = {}, html_options = {}, *parameters_for_method_reference). Documentation:
Creates a link tag to the image residing at the +src+ using an URL created by the set of +options+. See the valid options in
diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_record_helper.rb
index eee8b6b970..4f7d66d8f7 100644
--- a/actionpack/lib/action_view/helpers/active_record_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_record_helper.rb
@@ -52,12 +52,13 @@ module ActionView
def form(record_name, options = {})
record = instance_eval("@#{record_name}")
action = url_for(:action => options[:action] || (record.new_record? ? "create" : "update"))
+ submit_value = options[:submit_value] || action.gsub(/[^\w]/, '').capitalize
+
id_field = record.new_record? ? "" : InstanceTag.new(record_name, "id", self).to_input_field_tag("hidden")
-
- ""
+
+ %()
end
# Returns a string containing the error message attached to the +method+ on the +object+, if one exists.
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 5526c3eef4..8af3afb034 100755
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -143,8 +143,8 @@ module ActionView
end
month_options << ((date.kind_of?(Fixnum) ? date : date.month) == month_number ?
- "\n" :
- "\n"
+ %(\n) :
+ %(\n)
)
end
@@ -172,9 +172,9 @@ module ActionView
private
def select_html(type, options, prefix = nil, include_blank = false, discard_type = false)
- select_html = "\n"
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index 13aa9297ca..6139943567 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -10,7 +10,7 @@ module ActionView
# * tag("br") =>
# * tag("input", { "type" => "text"}) =>
def tag(name, options = {}, open = false)
- "<#{name + tag_options(options)}" + (open ? ">" : " />")
+ "<#{name}#{tag_options(options)}" + (open ? ">" : " />")
end
# Examples:
@@ -18,7 +18,7 @@ module ActionView
# * content_tag("div", content_tag("p", "Hello world!"), "class" => "strong") =>
#
def content_tag(name, content, options = {})
- "<#{name + tag_options(options)}>#{content}"
+ "<#{name}#{tag_options(options)}>#{content}"
end
# Starts a form tag that points the action to an url configured with url_for_options just like
@@ -46,12 +46,10 @@ module ActionView
private
def tag_options(options)
- if options.empty?
- ""
- else
- " " + options.collect { |pair|
- "#{pair.first}=\"#{html_escape(pair.last)}\""
- }.sort.join(" ")
+ unless options.empty?
+ " " + options.map { |key, value|
+ %(#{key}="#{html_escape(value)}")
+ }.sort.join(" ")
end
end
end
diff --git a/actionpack/test/template/active_record_helper_test.rb b/actionpack/test/template/active_record_helper_test.rb
index 9cc0f58d0a..5bae7ee6b5 100644
--- a/actionpack/test/template/active_record_helper_test.rb
+++ b/actionpack/test/template/active_record_helper_test.rb
@@ -51,27 +51,27 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
def test_generic_input_tag
assert_equal(
- '', input("post", "title")
+ %(), input("post", "title")
)
end
def test_text_area_with_errors
assert_equal(
- "",
+ %(),
text_area("post", "body")
)
end
def test_text_field_with_errors
assert_equal(
- '',
+ %(),
text_field("post", "author_name")
)
end
def test_form_with_string
assert_equal(
- "",
+ %(),
form("post")
)
end
@@ -80,7 +80,7 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
assert_equal(
- "",
+ %(),
form("post")
)
end
@@ -90,13 +90,13 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
@post.written_on = Time.gm(2004, 6, 15, 16, 30)
assert_equal(
- "",
+ %(),
form("post")
)
end
def test_error_for_block
- assert_equal "1 error prohibited this post from being saved
There were problems with the following fields:
- Author name can't be empty
1 error prohibited this post from being saved
There were problems with the following fields:
- Author name can't be empty
1 error prohibited this post from being saved
There were problems with the following fields:
- Author name can't be empty
1 error prohibited this post from being saved
There were problems with the following fields:
- Author name can't be empty