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

Revert batch processing on bulk actions - too buggy

Browse Source 
- minor fixes and cleanup
This commit is contained in:
Jonathan Labreuille
2016-05-27 14:07:54 +02:00
parent 3c46a5b434
commit 8292e9a744
4 changed files with 41 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Models/Subscriber.php
View File

@@ -544,13 +544,13 @@ class Subscriber extends Model {
if($segment === false) return false;
$subscribers_count = parent::bulkAction($orm,
function($subscriber_ids) use($segment) {
SubscriberSegment::deleteManySubscriptions(
$subscriber_ids, array($segment->id)
);
}
);
$subscribers_count = $orm->count();
parent::bulkAction($orm, function($subscriber_ids) use($segment) {
SubscriberSegment::deleteManySubscriptions(
$subscriber_ids, array($segment->id)
);
});
return array(
'subscribers' => $subscribers_count,
@@ -590,7 +590,9 @@ class Subscriber extends Model {
self::rawExecute(join(' ', array(
'UPDATE `'.self::$_table.'`',
'SET `deleted_at` = NOW()',
'WHERE `id` IN ('.rtrim(str_repeat('?,', count($subscriber_ids)), ',').')',
'WHERE `id` IN ('.
rtrim(str_repeat('?,', count($subscriber_ids)), ',')
.')',
'AND `wp_user_id` IS NULL'
)),
$subscriber_ids