Skip to content

Commit c27daab

Browse files
committed
- (Bug Fix) Fixed an issue that would cause PHP errors with 5.3.x
1 parent 6991fef commit c27daab

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

core/parcel_types/DefaultParcelType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function init()
4949
if($parcelType->validateEntry($entry, $event->params['isNewEntry']))
5050
{
5151
$obj = new Postmaster_TransportModel(array(
52-
'service' => $parcelType->parcel->service,
52+
'service' => $parcelType->getParcelModel()->service,
5353
'settings' => $parcelType->settings,
5454
'data' => array(
5555
'entry' => $entry,

core/parcel_types/EmailFormParcelType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ public function init()
2525

2626
$this->craft()->on('postmaster_forms.emailFormSend', function(Event $event) use ($parcelType)
2727
{
28-
$parcelType->parcel->parse(array_merge($event->params, array(
28+
$parcelType->getParcelModel()->parse(array_merge($event->params, array(
2929
'post' => $this->craft()->request->getPost()
3030
)));
3131

3232
if($parcelType->validate())
3333
{
3434
$obj = new Postmaster_TransportModel(array(
35-
'service' => $parcelType->parcel->service,
35+
'service' => $parcelType->getParcelModel()->service,
3636
'settings' => $parcelType->settings,
3737
'data' => $event->params
3838
));
3939

40-
$parcelType->parcel->send($obj);
40+
$parcelType->getParcelModel()->send($obj);
4141
}
4242
});
4343
}

core/parcel_types/UserEmailParcelType.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function init()
3131

3232
$isNewUser = isset($event->params['isNewUser']) ? $event->params['isNewUser'] : false;
3333

34-
$parcelType->parcel->settings->parse(array_merge($event->params, array(
34+
$parcelType->getParcelModel()->settings->parse(array_merge($event->params, array(
3535
'user' => $user,
3636
'isNewUser' => $isNewUser
3737
)));
@@ -41,7 +41,7 @@ public function init()
4141
'isNewUser' => $isNewUser
4242
)));
4343

44-
$parcelType->parcel->service->settings->parse(array_merge($event->params, array(
44+
$parcelType->getParcelModel()->service->settings->parse(array_merge($event->params, array(
4545
'user' => $user,
4646
'settings' => $parcelType->settings,
4747
'isNewUser' => $isNewUser
@@ -50,15 +50,15 @@ public function init()
5050
if($parcelType->validateUser($user, $isNewUser))
5151
{
5252
$obj = new Postmaster_TransportModel(array(
53-
'service' => $parcelType->parcel->service,
53+
'service' => $parcelType->getParcelModel()->service,
5454
'settings' => $parcelType->settings,
5555
'data' => array_merge($event->params, array(
5656
'user' => $user,
5757
'isNewUser' => $isNewUser
5858
))
5959
));
6060

61-
$parcelType->parcel->send($obj);
61+
$parcelType->getParcelModel()->send($obj);
6262
}
6363
});
6464
}

0 commit comments

Comments
 (0)