Merge remote-tracking branch '39710/fix-39464' into commpr_787643004

Author: engcom-Charlie

app/code/Magento/Catalog/Block/Widget/Link.php

@@ -81,6 +81,7 @@ public function getHref()
                 UrlRewrite::ENTITY_ID => $rewriteData[1],
                 UrlRewrite::ENTITY_TYPE => $rewriteData[0],
                 UrlRewrite::STORE_ID => $store->getId(),
+                UrlRewrite::REDIRECT_TYPE => 0,
             ];
             if (!empty($rewriteData[2]) && $rewriteData[0] == ProductUrlRewriteGenerator::ENTITY_TYPE) {
                 $filterData[UrlRewrite::METADATA]['category_id'] = $rewriteData[2];

app/code/Magento/Catalog/Test/Unit/Block/Widget/LinkTest.php

@@ -240,6 +240,7 @@ function ($route, $params) use ($storeId) {
                     UrlRewrite::ENTITY_ID => 'entity_id',
                     UrlRewrite::ENTITY_TYPE => 'entity_type',
                     UrlRewrite::STORE_ID => $this->storeManager->getStore($storeId)->getStoreId(),
+                    UrlRewrite::REDIRECT_TYPE => 0,
                 ]
             )
             ->willReturn($rewrite);
@@ -319,6 +320,7 @@ public function testGetHrefWithForProductWithCategoryIdParameter()
                     UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
                     UrlRewrite::STORE_ID => $storeId,
                     UrlRewrite::METADATA => ['category_id' => 'category_id'],
+                    UrlRewrite::REDIRECT_TYPE => 0,
                 ]
             )
             ->willReturn(false);