Merge pull request #440 from magento-tango/S56_PR

[Tango] S56 Bug Fixes

Author: vpelipenko

app/code/Magento/Customer/view/email/account_new.html

@@ -6,10 +6,10 @@
 -->
 <!--@subject Welcome, {{var customer.name}}! @-->
 <!--@vars
-{"store url=\"\"":"Store Url",
+{"store direct_url=\"\"":"Store Url",
 "var logo_url":"Email Logo Image Url",
 "escapehtml var=$customer.name":"Customer Name",
-"store url=\"customer/account/\"":"Customer Account Url",
+"store direct_url=\"customer/account/\"":"Customer Account Url",
 "var customer.email":"Customer Email",
 "escapehtml var=$customer.password":"Customer Password"}
 @-->
@@ -27,18 +27,18 @@
                 <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
                     <tr>
                         <td valign="top">
-                            <a href="{{store url=''}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
+                            <a href="{{store direct_url=''}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
                     </tr>
                 <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
                             <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{escapehtml var=$customer.name}},</h1>
-                            <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To sign in when visiting our site just click <a href="{{store url='customer/account/'}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url='customer/account/'}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your email address and password.</p>
+                            <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To sign in when visiting our site just click <a href="{{store direct_url='customer/account/'}}" style="color:#1E7EC8;">Login</a> or <a href="{{store direct_url='customer/account/'}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your email address and password.</p>
                             <p style="border:1px solid #E0E0E0; font-size:12px; line-height:16px; margin:0; padding:13px 18px; background:#f9f9f9;">
                                 Use the following values when prompted to sign in:<br/>
                                 <strong>Email</strong>: {{var customer.email}}<br/>
                                 <strong>Password</strong>: Only you know that! (Hint: It’s the password you created at {{var store.getFrontendName()}})<br/>
-                                Forgot your Account password? No problems. Click <a href="{{store url='customer/account/createPassword/' _query_id=$customer.id _query_token=$customer.rp_token}}">here</a> to reset it.</p>
+                                Forgot your Account password? No problems. Click <a href="{{store direct_url='customer/account/createPassword/' _query_id=$customer.id _query_token=$customer.rp_token}}">here</a> to reset it.</p>
                             </p>
                             <p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">When you sign in to your account, you will be able to do the following:</p>
                             <ul style="font-size:12px; line-height:16px; margin:0 0 16px 0; padding:0;">

app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php

@@ -180,7 +180,7 @@ protected function addCustomAttributeTypes($wsdl)
     {
         foreach ($this->customAttributeTypeLocator->getAllServiceDataInterfaces() as $customAttributeClass) {
             $typeName = $this->_typeProcessor->register($customAttributeClass);
-            $wsdl->addComplexType($typeName);
+            $wsdl->addComplexType($this->_typeProcessor->getArrayItemType($typeName));
         }
         return $wsdl;
     }