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

Fixed bulk actions (return false if no items were selected)

Browse Source 
- added missing check for WPUsers segment in case it does not exist
This commit is contained in:
Jonathan Labreuille
2016-05-20 18:20:58 +02:00
parent c4ddb38d18
commit 8c56c8da5e
4 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Models/SubscriberSegment.php
View File

@ -25,7 +25,10 @@ class SubscriberSegment extends Model {
foreach($segment_ids as $segment_id) {
// do not remove subscriptions to the WP Users segment
if($wp_users_segment->id === (int)$segment_id) {
if(
$wp_users_segment !== false
&& ($wp_users_segment->id === (int)$segment_id)
) {
continue;
}
@ -40,9 +43,15 @@ class SubscriberSegment extends Model {
return true;
} else {
// unsubscribe from all segments (except the WP users segment)
return SubscriberSegment::where('subscriber_id', $subscriber->id)
->whereNotEqual('segment_id', $wp_users_segment->id)
->findResultSet()
$subscritpions = SubscriberSegment::where('subscriber_id', $subscriber->id);
if($wp_users_segment !== false) {
$subscritpions = $subscritpions->whereNotEqual(
'segment_id', $wp_users_segment->id
);
}
$subscritpions->findResultSet()
->set('status', Subscriber::STATUS_UNSUBSCRIBED)
->save();
}