Merge pull request #12 from mageplaza/2.4-develop

2.4 develop

Block/Sitemap.php

@@ -141,7 +141,9 @@ public function getProductCollection()
             ->addTaxPercents()
             ->setPageSize($limit)
             ->addAttributeToSelect('*');
-        $this->_stockFilter->addInStockFilterToCollection($collection);
+        if (!$this->_helper->getConfigValue('cataloginventory/options/show_out_of_stock')) {
+            $this->_stockFilter->addInStockFilterToCollection($collection);
+        }
 
         return $collection;
     }

Model/Sitemap.php

@@ -411,7 +411,7 @@ public function _getProductCollection($storeId)
      */
     public function convertUrl($url)
     {
-        if (preg_match(self::PATTERN, $url)) {
+        if (preg_match('@^http://@i', $url) || preg_match('@^https://@i', $url)) {
             return $url;
         }
 

composer.json

@@ -1,27 +1,27 @@
-{
-  "name": "mageplaza/module-sitemap",
-  "description": "Magento 2 Google XML Sitemap extension",
-  "require": {
-    "mageplaza/module-core": "^1.4.5",
-    "mageplaza/magento-2-seo-extension": "^2.1.0"
-  },
-  "type": "magento2-module",
-  "version": "1.0.3",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "Mageplaza",
-      "email": "support@mageplaza.com",
-      "homepage": "https://www.mageplaza.com",
-      "role": "Technical Support"
-    }
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
-    ],
-    "psr-4": {
-      "Mageplaza\\Sitemap\\": ""
-    }
-  }
-}
+{
+  "name": "mageplaza/module-sitemap",
+  "description": "Magento 2 Google XML Sitemap extension",
+  "require": {
+    "mageplaza/module-core": "^1.4.5",
+    "mageplaza/magento-2-seo-extension": "^4.0.0"
+  },
+  "type": "magento2-module",
+  "version": "4.0.0",
+  "license": "proprietary",
+  "authors": [
+    {
+      "name": "Mageplaza",
+      "email": "support@mageplaza.com",
+      "homepage": "https://www.mageplaza.com",
+      "role": "Technical Support"
+    }
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Mageplaza\\Sitemap\\": ""
+    }
+  }
+}

i18n/en_US.csv

@@ -1,25 +1,25 @@
-"Parameter is incorrect.","Parameter is incorrect."
-"HTML Sitemap","HTML Sitemap"
-"Enable HTML Sitemap","Enable HTML Sitemap"
-"Enable Categories Sitemap","Enable Categories Sitemap"
-"Enable Products Sitemap","Enable Products Sitemap"
-"Limit Product Sitemap","Limit Product Sitemap"
-"Default is 100","Default is 100"
-"Enable Pages Sitemap","Enable Pages Sitemap"
-"Enable Exclude Pages Sitemap","Enable Exclude Pages Sitemap"
-"Filter Cms Pages","Filter Cms Pages"
-"Enable Additional Links","Enable Additional Links"
-"Additional Links","Additional Links"
-"Add Sitemap Link to Footer","Add Sitemap Link to Footer"
-"XML Sitemap","XML Sitemap"
-"Homepage Optimization","Homepage Optimization"
-"In sitemap file, it will remove the link of the CMS page using for homepage.","In sitemap file, it will remove the link of the CMS page using for homepage."
-"Yes, if you want to add more custom links into sitemap XML file.","Yes, if you want to add more custom links into sitemap XML file."
-"One link per line.","One link per line."
-Frequency,Frequency
-"One of the following value: <i>always, hourly, daily, weekly, monthly, yearly, never</i>. <a href=""https://www.sitemaps.org/protocol.html"" target=""_blank"">Learn more.</a>","One of the following value: <i>always, hourly, daily, weekly, monthly, yearly, never</i>. <a href=""https://www.sitemaps.org/protocol.html"" target=""_blank"">Learn more.</a>"
-Priority,Priority
-"From 0 to 1. E.g: 0.5 or 0.8","From 0 to 1. E.g: 0.5 or 0.8"
-"Exclude Sitemap","Exclude Sitemap"
-"Added by Mageplaza Sitemap","Added by Mageplaza Sitemap"
-Sitemap,Sitemap
+"Parameter is incorrect.","Parameter is incorrect."
+"HTML Sitemap","HTML Sitemap"
+"Enable HTML Sitemap","Enable HTML Sitemap"
+"Enable Categories Sitemap","Enable Categories Sitemap"
+"Enable Products Sitemap","Enable Products Sitemap"
+"Limit Product Sitemap","Limit Product Sitemap"
+"Default is 100","Default is 100"
+"Enable Pages Sitemap","Enable Pages Sitemap"
+"Enable Exclude Pages Sitemap","Enable Exclude Pages Sitemap"
+"Filter Cms Pages","Filter Cms Pages"
+"Enable Additional Links","Enable Additional Links"
+"Additional Links","Additional Links"
+"Add Sitemap Link to Footer","Add Sitemap Link to Footer"
+"XML Sitemap","XML Sitemap"
+"Homepage Optimization","Homepage Optimization"
+"In sitemap file, it will remove the link of the CMS page using for homepage.","In sitemap file, it will remove the link of the CMS page using for homepage."
+"Yes, if you want to add more custom links into sitemap XML file.","Yes, if you want to add more custom links into sitemap XML file."
+"One link per line.","One link per line."
+Frequency,Frequency
+"One of the following value: <i>always, hourly, daily, weekly, monthly, yearly, never</i>. <a href=""https://www.sitemaps.org/protocol.html"" target=""_blank"">Learn more.</a>","One of the following value: <i>always, hourly, daily, weekly, monthly, yearly, never</i>. <a href=""https://www.sitemaps.org/protocol.html"" target=""_blank"">Learn more.</a>"
+Priority,Priority
+"From 0 to 1. E.g: 0.5 or 0.8","From 0 to 1. E.g: 0.5 or 0.8"
+"Exclude Sitemap","Exclude Sitemap"
+"Added by Mageplaza Sitemap","Added by Mageplaza Sitemap"
+Sitemap,Sitemap

view/frontend/templates/disablelink.phtml

@@ -21,7 +21,7 @@
 
 /** @var \Mageplaza\Sitemap\Block\Sitemap $block */
 ?>
-<?php if (!$block->isEnableHtmlSitemap()) : ?>
+<?php if (!$block->isEnableHtmlSitemap()): ?>
     <style type="text/css">
         .footer.links a[href*="sitemap"] {
             display: none;