From b754973b0c24a5d4482ba6b027f8d673a64dae80 Mon Sep 17 00:00:00 2001
From: Magento EngCom Team <magento-engcom-team@magento.com>
Date: Wed, 24 Jan 2018 12:09:32 -0600
Subject: [PATCH] :arrow_double_up: Forwardport of magento/magento2#12308 to
 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/12308.patch (created by @RomaKis) based on commit(s):
  1. 24eee6414605d1b2ec0640fbfd9e8c660fbd960d
  2. ec33cc50bbe9be7559b179f4a0d75b4ca062ecb8

Fixed GitHub Issues in 2.3-develop branch:
  - magento/magento2#12261: Order confirmation email contains non functioning links (reported by @bondimedical3)
---
 .../Magento/luma/Magento_Email/email/footer.html     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Email/email/footer.html b/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
index 994f9e6bffed8..0fc8e36a82076 100644
--- a/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
+++ b/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
@@ -17,8 +17,16 @@
                         <table>
                             <tr>
                                 <td>
-                                    <p><a href="#">{{trans "About Us"}}</a></p>
-                                    <p><a href="#">{{trans "Customer Service"}}</a></p>
+                                    {{depend url_about_us}}
+                                    <p>
+                                        {{trans '<a href=%url_about_us>About Us</a>' url_about_us=$url_about_us |raw}}
+                                    </p>
+                                    {{/depend}}
+                                    {{depend url_customer_service}}
+                                    <p>
+                                        {{trans '<a href=url_customer_service>Customer Service</a>' url_customer_service=$url_customer_service |raw}}
+                                    </p>
+                                    {{/depend}}
                                 </td>
                                 <td>
                                     {{depend store_phone}}