- (Bug Fix) Fixed an issue with notification types not getting parsed correctly

objectivehtml · objectivehtml · commit 2129dbb50810 · 2015-01-16T12:38:42.000-05:00
diff --git a/core/notification_types/AfterUserInactivityNotificationType.php b/core/notification_types/AfterUserInactivityNotificationType.php
@@ -60,7 +60,7 @@ public function onBeforeSend(Postmaster_TransportModel $model, $debug = false)
             }
         }
 
-        $this->notification->parse(array(
+        $this->parse(array(
             'user' => $user
         ));
 
diff --git a/core/notification_types/DefaultNotificationType.php b/core/notification_types/DefaultNotificationType.php
@@ -20,7 +20,7 @@ public function getId()
 
 	public function onBeforeSend(Postmaster_TransportModel $model)
 	{
-		$this->notification->parse(array());
+		$this->parse(array());
 
 		if($this->hasExtraConditionals() && !$this->areExtraConditionalsValid())
 		{
diff --git a/core/notification_types/ExpiredEntriesNotificationType.php b/core/notification_types/ExpiredEntriesNotificationType.php
@@ -40,7 +40,7 @@ public function onBeforeSend(Postmaster_TransportModel $model)
         $model->senderId = $entry->id;
 
         // Parse the notification with the entry
-        $this->notification->parse(array(
+        $this->parse(array(
         	'entry' => $entry
         ));
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function onBeforeSend(Postmaster_TransportModel $model, $debug = false)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- $this->notification->parse(array(`
	`63`	`+ $this->parse(array(`
`64`	`64`	`'user' => $user`
`65`	`65`	`));`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function getId()`
`20`	`20`
`21`	`21`	`public function onBeforeSend(Postmaster_TransportModel $model)`
`22`	`22`	`{`
`23`		`- $this->notification->parse(array());`
	`23`	`+ $this->parse(array());`
`24`	`24`
`25`	`25`	`if($this->hasExtraConditionals() && !$this->areExtraConditionalsValid())`
`26`	`26`	`{`