sometimes layout content can be nil when working with fixtures

Oleg committed Jan 04, 2012
commit 2c23d682213e2992bcaf7d0d270dd01fd4ee4d0a
Showing 1 changed file with 2 additions and 2 deletions
app/models/cms/layout.rb +2 -2
@@ @@ -63,10 +63,10 @@ class Cms::Layout < ActiveRecord::Base
if parent.merged_content.match(regex)
parent.merged_content.gsub(regex, content.to_s)
else
- content
+ content.to_s
end
else
- content
+ content.to_s
end
end