Merge branch 'MAGETWO-91560' into mpi-forwardport-0309

Author: Mariana

app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml

@@ -10,41 +10,49 @@
 ?>
 <div class="multicheckout">
     <div class="block block-billing">
-    <?php foreach ($block->getAddress() as $_address): ?>
+    <?php foreach ($block->getAddress() as $address): ?>
         <div class="box box-billing-address">
             <div class="box-content">
                 <address>
-                    <?= $block->getAddressAsHtml($_address) ?>
-                    <?php if ($block->isAddressDefaultBilling($_address)): ?>
-                        <br /><strong><?= /* @escapeNotVerified */ __('Default Billing') ?></strong>
+                    <?= $block->getAddressAsHtml($address) ?>
+                    <?php if ($block->isAddressDefaultBilling($address)): ?>
+                        <br /><strong><?= $block->escapeHtml(__('Default Billing')); ?></strong>
                     <?php endif; ?>
-                    <?php if ($block->isAddressDefaultShipping($_address)): ?>
-                        <br /><strong><?= /* @escapeNotVerified */ __('Default Shipping') ?></strong>
+                    <?php if ($block->isAddressDefaultShipping($address)): ?>
+                        <br /><strong><?= $block->escapeHtml(__('Default Shipping')); ?></strong>
                     <?php endif; ?>
                 </address>
             </div>
             <div class="box-actions">
-                <a href="<?= /* @escapeNotVerified */ $block->getEditAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Address') ?></span></a>
-                <a href="<?= /* @escapeNotVerified */ $block->getSetAddressUrl($_address) ?>" class="action select"><span><?= /* @escapeNotVerified */ __('Select Address') ?></span></a>
+                <a href="<?= $block->escapeUrl($block->getEditAddressUrl($address)); ?>" class="action edit">
+                    <span><?= $block->escapeHtml(__('Edit Address')); ?></span>
+                </a>
+                <a href="<?= $block->escapeUrl($block->getSetAddressUrl($address)); ?>" class="action select">
+                    <span><?= $block->escapeHtml(__('Select Address')); ?></span>
+                </a>
             </div>
         </div>
     <?php endforeach; ?>
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="button" class="action add primary" role="add-address" title="<?= /* @escapeNotVerified */ __('Add New Address') ?>"><span><?= /* @escapeNotVerified */ __('Add New Address') ?></span></button>
+            <button type="button" class="action add primary" role="add-address" title="<?= $block->escapeHtml(__('Add New Address')); ?>">
+                <span><?= $block->escapeHtml(__('Add New Address')); ?></span>
+            </button>
         </div>
         <div class="secondary">
-            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Billing Information') ?></span></a>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
+                <span><?= $block->escapeHtml(__('Back to Billing Information')); ?></span>
+            </a>
         </div>
     </div>
 </div>
 <script type="text/x-magento-init">
     {
-        ".actions": {
+        ".action": {
             "address": {
                 "addAddress": "button[role='add-address']",
-                "addAddressLocation": "<?= /* @escapeNotVerified */ $block->getAddNewUrl() ?>"
+                "addAddressLocation": "<?= $block->escapeUrl($block->getAddNewUrl()); ?>"
             }
         }
     }