summaryrefslogtreecommitdiff
path: root/lib/rss/maker/entry.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rss/maker/entry.rb')
-rw-r--r--lib/rss/maker/entry.rb14
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb
index baa22c5bf1..be648832c3 100644
--- a/lib/rss/maker/entry.rb
+++ b/lib/rss/maker/entry.rb
@@ -75,12 +75,6 @@ module RSS
end
end
- def have_required_values?
- set_default_values do
- super and title.have_required_values?
- end
- end
-
private
def required_variable_names
%w(id updated)
@@ -100,7 +94,7 @@ module RSS
if authors.all? {|author| !author.have_required_values?}
vars << "author"
end
- vars << "title" unless title.have_required_values?
+ vars << "title" unless title {|t| t.have_required_values?}
vars
end
end
@@ -126,9 +120,11 @@ module RSS
self.id ||= link || @maker.channel.id
links.replace(@maker.channel.links) if keep[:links].empty?
unless keep[:rights].variable_is_set?
- @rights = @maker.channel.rights
+ @maker.channel.rights {|r| @rights = r}
+ end
+ unless keep[:title].variable_is_set?
+ @maker.channel.title {|t| @title = t}
end
- @title = @maker.channel.title unless keep[:title].variable_is_set?
self.updated ||= @maker.channel.updated
super(&block)
ensure