Skip to content

Instantly share code, notes, and snippets.

@dmilith
Created December 25, 2008 23:49
Show Gist options
  • Select an option

  • Save dmilith/39979 to your computer and use it in GitHub Desktop.

Select an option

Save dmilith/39979 to your computer and use it in GitHub Desktop.
diff --git a/slices/merb-auth-slice-activation/app/helpers/mailer_helper.rb b/slices/merb-auth-slice-activation/app/help
index c3feb44..964101b 100644
--- a/slices/merb-auth-slice-activation/app/helpers/mailer_helper.rb
+++ b/slices/merb-auth-slice-activation/app/helpers/mailer_helper.rb
@@ -5,11 +5,9 @@ module Merb
# Does it's best to
def activation_url(user)
@activation_host ||= MaSA[:activation_host] || MaSA[:default_activation_host]
- @activation_protocol ||= MaSA[:activation_protocol] || "http"
if base_controller # Rendering from a web controller
@activation_host ||= base_controller.request.host
- @activation_protocol ||= "http"
end
@activation_host ||= case @activation_host
@@ -21,7 +19,7 @@ module Merb
raise "There is no host set for the activation email. Set Merb::Slices::config[:merb_auth_slice_activation][:a
- "#{@activation_protocol}://#{@activation_host}#{slice_url(:activate, :activation_code => user.activation_code)}
+ "#{@activation_host}#{slice_url(:activate, :activation_code => user.activation_code)}"
end
end # MailerHelper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment