Skip to content

Commit

Permalink
Merge pull request #15 from mageplaza/2.4-develop
Browse files Browse the repository at this point in the history
2.4 develop
  • Loading branch information
haitv282 authored Nov 8, 2022
2 parents 8eca9e6 + 99ec35c commit 7f16917
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Block/SocialShare.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public function isThisPageEnable()
$allowPages = null;

if ($type === 'inline') {
$allowPages = explode(',', $this->_helperData->getInlineApplyPages());
$allowPages = explode(',', $this->_helperData->getInlineApplyPages()?:'');
if ($this->isShowUnderCart()) {
$allowPages[] = 'under_cart';
}
Expand All @@ -308,8 +308,8 @@ public function isThisPageEnable()
return true;
}
if ($this->_helperData->getFloatApplyPages() === FloatApplyFor::SELECT_PAGES) {
$selectPages = explode(',', $this->_helperData->getFloatSelectPages());
$cmsPages = explode(',', $this->_helperData->getFloatCmsPages());
$selectPages = explode(',', $this->_helperData->getFloatSelectPages()?:'');
$cmsPages = explode(',', $this->_helperData->getFloatCmsPages()?:'');
if ($thisPage === 'cms_page') {
$pageId = $this->_page->getPage()->getId();
if (in_array($pageId, $cmsPages, true)) {
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "mageplaza/module-social-share",
"description": "Magento 2 Social Share Extension",
"require": {
"mageplaza/module-core": "^1.4.5"
"mageplaza/module-core": "^1.5.0"
},
"type": "magento2-module",
"version": "4.0.1",
"version": "4.0.2",
"license": "proprietary",
"authors": [
{
Expand Down
1 change: 1 addition & 0 deletions view/frontend/templates/socialshare.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<style type="text/css">
.a2a_svg, .a2a_count {
border-radius: <?= /* @noEscape */ $block->getBorderRadius()?> !important;
display: block;
}

<?php if ($block->isDisplayInline()):?>
Expand Down

0 comments on commit 7f16917

Please sign in to comment.