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

Fix code style [MAILPOET-489]

Browse Source
This commit is contained in:
Alexey Stoletniy
2016-12-27 19:16:18 +03:00
parent 2c5e73305a
commit 9a8f028a01
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Models/Newsletter.php
View File

@@ -182,9 +182,9 @@ class Newsletter extends Model {
);
}
function withSegments($inclDeleted = false) {
function withSegments($incl_deleted = false) {
$this->segments = $this->segments()->findArray();
if($inclDeleted) {
if($incl_deleted) {
$this->withDeletedSegments();
}
return $this;
@@ -201,18 +201,18 @@ class Newsletter extends Model {
function withDeletedSegments() {
if(!empty($this->segments)) {
$segmentIds = Helpers::arrayColumn($this->segments, 'id');
$segment_ids = Helpers::arrayColumn($this->segments, 'id');
$links = $this->segmentLinks()
->whereNotIn('segment_id', $segmentIds)->findArray();
$deletedSegments = array();
->whereNotIn('segment_id', $segment_ids)->findArray();
$deleted_segments = array();
foreach($links as $link) {
$deletedSegments[] = array(
$deleted_segments[] = array(
'id' => $link['segment_id'],
'name' => __('Deleted list', 'mailpoet')
);
}
$this->segments = array_merge($this->segments, $deletedSegments);
$this->segments = array_merge($this->segments, $deleted_segments);
}
return $this;