From eda969dd725045b6bf0a0a03f7611dea88e28b01 Mon Sep 17 00:00:00 2001 From: David Remer Date: Fri, 18 Feb 2022 11:56:13 +0200 Subject: [PATCH] Fix action_argument_value of shortcode will be string if empty [MAILPOET-4151] --- mailpoet/lib/Newsletter/Shortcodes/Shortcodes.php | 2 +- mailpoet/tests/integration/Newsletter/ShortcodesTest.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mailpoet/lib/Newsletter/Shortcodes/Shortcodes.php b/mailpoet/lib/Newsletter/Shortcodes/Shortcodes.php index e45ffadfd0..d9505682fd 100644 --- a/mailpoet/lib/Newsletter/Shortcodes/Shortcodes.php +++ b/mailpoet/lib/Newsletter/Shortcodes/Shortcodes.php @@ -151,7 +151,7 @@ class Shortcodes { ''; $shortcodeDetails['action_argument_value'] = !empty($shortcodeDetails['argument_value']) ? $shortcodeDetails['argument_value'] : - false; + ''; $shortcodeDetails['arguments'] = !empty($shortcodeDetails['arguments']) ? $shortcodeDetails['arguments'] : []; diff --git a/mailpoet/tests/integration/Newsletter/ShortcodesTest.php b/mailpoet/tests/integration/Newsletter/ShortcodesTest.php index f25bc32399..f6dad3a1e5 100644 --- a/mailpoet/tests/integration/Newsletter/ShortcodesTest.php +++ b/mailpoet/tests/integration/Newsletter/ShortcodesTest.php @@ -372,6 +372,15 @@ class ShortcodesTest extends \MailPoetTest { } } + public function testItCanProcessShortcodeWithEmptyDefault() { + $shortcode = '[subscriber:lastname | default:]'; + $shortcodesObject = $this->shortcodesObject; + $subscriberWithoutLastname = new SubscriberEntity(); + $shortcodesObject->setSubscriber($subscriberWithoutLastname); + $result = $shortcodesObject->process([$shortcode]); + expect($result[0])->equals(''); + } + public function testItCanProcessCustomLinkShortcodes() { $shortcodesObject = $this->shortcodesObject; $shortcodesObject->setWpUserPreview(false);