fix addition link and show out-of-stock product on html sitemap

Tuvpt · Tuvpt · commit b5b2ed680a64 · 2020-11-02T14:15:56.000+07:00
diff --git a/Block/Sitemap.php b/Block/Sitemap.php
@@ -141,7 +141,7 @@ public function getProductCollection()
             ->addTaxPercents()
             ->setPageSize($limit)
             ->addAttributeToSelect('*');
-        if (!$this->_helper->getConfigValue('cataloginventory\options\show_out_of_stock')) {
+        if (!$this->_helper->getConfigValue('cataloginventory/options/show_out_of_stock')) {
             $this->_stockFilter->addInStockFilterToCollection($collection);
         }
 
diff --git a/Model/Sitemap.php b/Model/Sitemap.php
@@ -411,7 +411,7 @@ public function _getProductCollection($storeId)
      */
     public function convertUrl($url)
     {
-        if (preg_match('@^http://@i', $url)) {
+        if (preg_match('@^http://@i', $url) || preg_match('@^https://@i', $url)) {
             return $url;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function getProductCollection()`
`141`	`141`	`->addTaxPercents()`
`142`	`142`	`->setPageSize($limit)`
`143`	`143`	`->addAttributeToSelect('*');`
`144`		`- if (!$this->_helper->getConfigValue('cataloginventory\options\show_out_of_stock')) {`
	`144`	`+ if (!$this->_helper->getConfigValue('cataloginventory/options/show_out_of_stock')) {`
`145`	`145`	`$this->_stockFilter->addInStockFilterToCollection($collection);`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ public function _getProductCollection($storeId)`
`411`	`411`	`*/`
`412`	`412`	`public function convertUrl($url)`
`413`	`413`	`{`
`414`		`- if (preg_match('@^http://@i', $url)) {`
	`414`	`+ if (preg_match('@^http://@i', $url) \|\| preg_match('@^https://@i', $url)) {`
`415`	`415`	`return $url;`
`416`	`416`	`}`
`417`	`417`