- Fixes custom field shortcode matching logic

lib/Newsletter/Shortcodes/Categories/Subscriber.php

@@ -1,8 +1,8 @@
 <?php
 namespace MailPoet\Newsletter\Shortcodes\Categories;
 
-use MailPoet\Models\SubscriberCustomField;
 use MailPoet\Models\Subscriber as SubscriberModel;
+use MailPoet\Models\SubscriberCustomField;
 
 require_once(ABSPATH . 'wp-includes/pluggable.php');
 
@@ -31,17 +31,19 @@ class Subscriber {
         return $default_value;
         break;
       case 'count':
-        return SubscriberModel::filter('subscribed')->count();
+        return SubscriberModel::filter('subscribed')
+          ->count();
         break;
-      case preg_match('/cf_(\d+)/', $action, $custom_field) ? true : false:
+      default:
-        if(empty($subscriber['id'])) return false;
+        if(preg_match('/cf_(\d+)/', $action, $custom_field) &&
+          !empty($subscriber['id'])
+        ) {
           $custom_field = SubscriberCustomField
             ::where('subscriber_id', $subscriber['id'])
             ->where('custom_field_id', $custom_field[1])
             ->findOne();
           return ($custom_field) ? $custom_field->value : false;
-      break;
+        }
-      default:
         return false;
         break;
     }