mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix spurious newlines and spaces in AR::Base#to_xml output
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4862 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
ff063d700d
commit
3ea2549e7a
2 changed files with 8 additions and 14 deletions
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Fix spurious newlines and spaces in AR::Base#to_xml output [Jamis Buck]
|
||||
|
||||
* has_one supports the :dependent => :delete option which skips the typical callback chain and deletes the associated object directly from the database. #5927 [Chris Mear, Jonathan Viney]
|
||||
|
||||
* Nested subclasses are not prefixed with the parent class' table_name since they should always use the base class' table_name. #5911 [Jonathan Viney]
|
||||
|
|
|
@ -214,19 +214,11 @@ module ActiveRecord #:nodoc:
|
|||
|
||||
|
||||
def add_tag(attribute)
|
||||
if attribute.needs_encoding?
|
||||
builder.tag!(
|
||||
dasherize? ? attribute.name.dasherize : attribute.name,
|
||||
attribute.value.to_s,
|
||||
attribute.decorations(!options[:skip_types])
|
||||
)
|
||||
else
|
||||
builder.tag!(
|
||||
dasherize? ? attribute.name.dasherize : attribute.name,
|
||||
attribute.decorations(!options[:skip_types])) do
|
||||
builder << attribute.value.to_s
|
||||
end
|
||||
end
|
||||
builder.tag!(
|
||||
dasherize? ? attribute.name.dasherize : attribute.name,
|
||||
attribute.value.to_s,
|
||||
attribute.decorations(!options[:skip_types])
|
||||
)
|
||||
end
|
||||
|
||||
def serialize
|
||||
|
@ -308,4 +300,4 @@ module ActiveRecord #:nodoc:
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue