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

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

View File

@ -21,9 +21,9 @@ class Subscriber {
'';
switch($action) {
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':
return ($subscriber && !empty($subscriber->last_name)) ? $subscriber->last_name : $default_value;
return (!empty($subscriber->last_name)) ? $subscriber->last_name : $default_value;
case 'email':
return ($subscriber) ? $subscriber->email : false;
case 'displayname':