Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove a redundant condition, fix a typo in a test name [MAILPOET-880]

Browse Source
This commit is contained in:
Alexey Stoletniy
2017-05-01 11:20:33 +03:00
parent 4e76286b44
commit 40a3487d3d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Newsletter/Shortcodes/Categories/Subscriber.php
View File

@ -21,9 +21,9 @@ class Subscriber {
''; '';
switch($action) { switch($action) {
case 'firstname': case 'firstname':
return ($subscriber && !empty($subscriber->first_name)) ? $subscriber->first_name : $default_value; return (!empty($subscriber->first_name)) ? $subscriber->first_name : $default_value;
case 'lastname': case 'lastname':
return ($subscriber && !empty($subscriber->last_name)) ? $subscriber->last_name : $default_value; return (!empty($subscriber->last_name)) ? $subscriber->last_name : $default_value;
case 'email': case 'email':
return ($subscriber) ? $subscriber->email : false; return ($subscriber) ? $subscriber->email : false;
case 'displayname': case 'displayname':

2
tests/unit/Newsletter/ShortcodesTest.php
View File

@ -159,7 +159,7 @@ class ShortcodesTest extends MailPoetTest {
expect($result[0])->false(); expect($result[0])->false();
} }
function testSubscriberFirstAndLastNameShortcodesReturnDefaultValueWhenDataIsEpty() { function testSubscriberFirstAndLastNameShortcodesReturnDefaultValueWhenDataIsEmpty() {
// when subscriber exists but first or last names are empty, default value is returned // when subscriber exists but first or last names are empty, default value is returned
$subscriber = $this->subscriber; $subscriber = $this->subscriber;
$subscriber->first_name = ''; $subscriber->first_name = '';