Merge remote-tracking branch 'origin/master' into groups

app/views/shared/mailers/_social_and_contact.html.haml

@@ -24,6 +24,5 @@
               %h5
                 = t :email_contact
               %strong
-                %a{href: ContentConfig.footer_email.reverse, mailto: true, target: '_blank'}
-                  #{ContentConfig.footer_email}
+                = mail_to ContentConfig.footer_email
       %span.clear

spec/mailers/order_mailer_spec.rb

@@ -40,5 +40,12 @@ describe Spree::OrderMailer do
       ActionMailer::Base.deliveries.count.should == 1
       ActionMailer::Base.deliveries.first.to.should == [@distributor.email]
     end
+
+    it "sends an email even if a footer_email is given" do
+      # Testing bug introduced by a9c37c162e1956028704fbdf74ce1c56c5b3ce7d
+      ContentConfig.footer_email = "email@example.com"
+      Spree::OrderMailer.confirm_email_for_shop(@order1.id).deliver
+      ActionMailer::Base.deliveries.count.should == 1
+    end
   end
 end