Merge pull request #32 from mageplaza/2.4-develop

2.4 develop
mageplaza · Jul 13, 2022 · 1d16261 · 1d16261
2 parents 9433ac3 + b65b499
commit 1d16261
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Block/Popup.php b/Block/Popup.php
@@ -212,7 +212,7 @@ public function checkExclude()
     public function checkExcludePages()
     {
         $fullActionName = $this->getRequest()->getFullActionName();
-        $arrayPages     = explode("\n", $this->_helperData->getWhereToShowConfig('exclude_pages'));
+        $arrayPages     = explode("\n", $this->_helperData->getWhereToShowConfig('exclude_pages') ?: '');
         $includePages   = array_map('trim', $arrayPages);
 
         return !in_array($fullActionName, $includePages, true);
@@ -233,7 +233,7 @@ public function checkExcludePaths()
             $pathsUrl   = array_map('trim', $arrayPaths);
 
             foreach ($pathsUrl as $path) {
-                if (strpos($currentPath, $path) !== false) {
+                if (!empty($path) && strpos($currentPath, $path) !== false) {
                     return false;
                 }
             }

diff --git a/composer.json b/composer.json
@@ -2,11 +2,11 @@
   "name": "mageplaza/module-better-popup",
   "description": "Magento 2 Better Popup",
   "require": {
-    "mageplaza/module-core": "^1.4.5",
-    "mageplaza/module-smtp": "^4.5.3"
+    "mageplaza/module-core": "^1.4.12",
+    "mageplaza/module-smtp": "^4.7.2"
   },
   "type": "magento2-module",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "license": "proprietary",
   "authors": [
     {