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

updated Subscriber:: -> self:: in Models\Subscriber

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-02-08 14:43:59 +01:00
parent 95b0b39366
commit f9c5b99e46
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Models/Subscriber.php
View File

@ -58,7 +58,7 @@ class Subscriber extends Model {
return false; return false;
} }
$subscriber = Subscriber::createOrUpdate($subscriber_data); $subscriber = self::createOrUpdate($subscriber_data);
if($subscriber !== false && $subscriber->id() > 0) { if($subscriber !== false && $subscriber->id() > 0) {
// restore deleted subscriber // restore deleted subscriber
@ -103,7 +103,7 @@ class Subscriber extends Model {
$segment_list[] = array( $segment_list[] = array(
'label' => sprintf( 'label' => sprintf(
__('Subscribers without a segment (%d)'), __('Subscribers without a segment (%d)'),
Subscriber::filter('withoutSegments')->count() self::filter('withoutSegments')->count()
), ),
'value' => 'none' 'value' => 'none'
); );
@ -132,7 +132,7 @@ class Subscriber extends Model {
foreach($filters as $key => $value) { foreach($filters as $key => $value) {
if($key === 'segment') { if($key === 'segment') {
if($value === 'none') { if($value === 'none') {
return Subscriber::filter('withoutSegments'); return self::filter('withoutSegments');
} else { } else {
$segment = Segment::findOne($value); $segment = Segment::findOne($value);
if($segment !== false) { if($segment !== false) {
@ -149,27 +149,27 @@ class Subscriber extends Model {
array( array(
'name' => 'all', 'name' => 'all',
'label' => __('All'), 'label' => __('All'),
'count' => Subscriber::getPublished()->count() 'count' => self::getPublished()->count()
), ),
array( array(
'name' => 'subscribed', 'name' => 'subscribed',
'label' => __('Subscribed'), 'label' => __('Subscribed'),
'count' => Subscriber::filter('subscribed')->count() 'count' => self::filter('subscribed')->count()
), ),
array( array(
'name' => 'unconfirmed', 'name' => 'unconfirmed',
'label' => __('Unconfirmed'), 'label' => __('Unconfirmed'),
'count' => Subscriber::filter('unconfirmed')->count() 'count' => self::filter('unconfirmed')->count()
), ),
array( array(
'name' => 'unsubscribed', 'name' => 'unsubscribed',
'label' => __('Unsubscribed'), 'label' => __('Unsubscribed'),
'count' => Subscriber::filter('unsubscribed')->count() 'count' => self::filter('unsubscribed')->count()
), ),
array( array(
'name' => 'trash', 'name' => 'trash',
'label' => __('Trash'), 'label' => __('Trash'),
'count' => Subscriber::getTrashed()->count() 'count' => self::getTrashed()->count()
) )
); );
} }
@ -240,12 +240,12 @@ class Subscriber extends Model {
$subscriber = false; $subscriber = false;
if(isset($data['id']) && (int)$data['id'] > 0) { if(isset($data['id']) && (int)$data['id'] > 0) {
$subscriber = Subscriber::findOne((int)$data['id']); $subscriber = self::findOne((int)$data['id']);
unset($data['id']); unset($data['id']);
} }
if($subscriber === false && !empty($data['email'])) { if($subscriber === false && !empty($data['email'])) {
$subscriber = Subscriber::where('email', $data['email'])->findOne(); $subscriber = self::where('email', $data['email'])->findOne();
if($subscriber !== false) { if($subscriber !== false) {
unset($data['email']); unset($data['email']);
} }
@ -270,7 +270,7 @@ class Subscriber extends Model {
} }
if($subscriber === false) { if($subscriber === false) {
$subscriber = Subscriber::create(); $subscriber = self::create();
$subscriber->hydrate($data); $subscriber->hydrate($data);
} else { } else {
$subscriber->set($data); $subscriber->set($data);