Fix indentation issues
This commit is contained in:
@@ -179,23 +179,25 @@ class Export {
|
||||
|
||||
function getSubscribers($offset, $limit) {
|
||||
// JOIN subscribers on segment and subscriber_segment tables
|
||||
$subscribers = Subscriber::
|
||||
left_outer_join(
|
||||
$subscribers = Subscriber::left_outer_join(
|
||||
SubscriberSegment::$_table,
|
||||
array(
|
||||
Subscriber::$_table . '.id',
|
||||
'=',
|
||||
SubscriberSegment::$_table . '.subscriber_id'
|
||||
))
|
||||
)
|
||||
)
|
||||
->left_outer_join(
|
||||
Segment::$_table,
|
||||
array(
|
||||
Segment::$_table . '.id',
|
||||
'=',
|
||||
SubscriberSegment::$_table . '.segment_id'
|
||||
))
|
||||
)
|
||||
)
|
||||
->filter('filterWithCustomFieldsForExport')
|
||||
->groupBy(Subscriber::$_table . '.id');
|
||||
|
||||
if($this->subscribers_without_segment !== false) {
|
||||
// if there are subscribers who do not belong to any segment, use
|
||||
// a CASE function to group them under "Not In Segment"
|
||||
@@ -276,4 +278,4 @@ class Export {
|
||||
return $subscriber[$field];
|
||||
}, $this->subscriber_fields);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -293,11 +293,10 @@ class Import {
|
||||
);
|
||||
}
|
||||
}
|
||||
$query = Subscriber::selectMany(
|
||||
array(
|
||||
'id',
|
||||
'email'
|
||||
));
|
||||
$query = Subscriber::selectMany(array(
|
||||
'id',
|
||||
'email'
|
||||
));
|
||||
$query = ($action === 'update') ?
|
||||
$query->where('updated_at', $this->updated_at) :
|
||||
$query->where('created_at', $this->created_at);
|
||||
@@ -373,4 +372,4 @@ class Import {
|
||||
$profiler_end = microtime(true);
|
||||
return ($profiler_end - $this->profiler_start) / 60;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user