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

- Fixes custom field shortcode matching logic

Browse Source
This commit is contained in:
Vlad
2016-06-01 09:48:01 -04:00
parent a208104fc8
commit 61987a204e
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
<?php <?php
namespace MailPoet\Newsletter\Shortcodes\Categories; namespace MailPoet\Newsletter\Shortcodes\Categories;
use MailPoet\Models\SubscriberCustomField;
use MailPoet\Models\Subscriber as SubscriberModel; use MailPoet\Models\Subscriber as SubscriberModel;
use MailPoet\Models\SubscriberCustomField;
require_once(ABSPATH . 'wp-includes/pluggable.php'); require_once(ABSPATH . 'wp-includes/pluggable.php');
@ -16,34 +16,36 @@ class Subscriber {
switch($action) { switch($action) {
case 'firstname': case 'firstname':
return ($subscriber) ? $subscriber['first_name'] : $default_value; return ($subscriber) ? $subscriber['first_name'] : $default_value;
break; break;
case 'lastname': case 'lastname':
return ($subscriber) ? $subscriber['last_name'] : $default_value; return ($subscriber) ? $subscriber['last_name'] : $default_value;
break; break;
case 'email': case 'email':
return ($subscriber) ? $subscriber['email'] : false; return ($subscriber) ? $subscriber['email'] : false;
break; break;
case 'displayname': case 'displayname':
if($subscriber && $subscriber['wp_user_id']) { if($subscriber && $subscriber['wp_user_id']) {
$wp_user = get_userdata($subscriber['wp_user_id']); $wp_user = get_userdata($subscriber['wp_user_id']);
return $wp_user->user_login; return $wp_user->user_login;
} }
return $default_value; return $default_value;
break; break;
case 'count': case 'count':
return SubscriberModel::filter('subscribed')->count(); return SubscriberModel::filter('subscribed')
break; ->count();
case preg_match('/cf_(\d+)/', $action, $custom_field) ? true : false: break;
if(empty($subscriber['id'])) return false;
$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: default:
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;
}
return false; return false;
break; break;
} }
} }
} }