Adds fixes for issue #13227

Author: atishgoswami

app/code/Magento/Catalog/Model/Product/Url.php

@@ -162,11 +162,8 @@ public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 );
 
-                if ($categoryId) {
-                    $filterData[UrlRewrite::METADATA]['category_id'] = $categoryId;
-                } elseif (!$useCategories) {
-                    $filterData[UrlRewrite::METADATA]['category_id'] = '';
-                }
+                $filterData[UrlRewrite::METADATA]['category_id']
+                    = $categoryId && $useCategories ? $categoryId : '';
 
                 $rewrite = $this->urlFinder->findOneByData($filterData);