Skip to content

Commit

Permalink
namespaced config function as it conflicts with twitter extension
Browse files Browse the repository at this point in the history
  • Loading branch information
Edmund Haselwanter committed Mar 4, 2010
1 parent a3a5eb7 commit 22382ab
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/mailer_tags.rb
Expand Up @@ -2,8 +2,8 @@ module MailerTags
include Radiant::Taggable
include ActionView::Helpers::DateHelper

def config
@config ||= begin
def mailer_config
@mailer_config ||= begin
page = self
until page.part(:mailer) or (not page.parent)
page = page.parent
Expand All @@ -15,10 +15,10 @@ def config

desc %{ All mailer-related tags live inside this one. }
tag "mailer" do |tag|
if Mail.valid_config?(config)
if Mail.valid_config?(mailer_config)
tag.expand
else
"Mailer config is invalid: #{Mail.config_error_messages(config)}"
"Mailer config is invalid: #{Mail.config_error_messages(mailer_config)}"
end
end

Expand Down

0 comments on commit 22382ab

Please sign in to comment.