From 44f84c6cdb99b029ad6d63b8ccd6d40e218b0d20 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 18 Aug 2016 09:18:44 -0400 Subject: [PATCH] - Updates method names --- lib/Newsletter/ViewInBrowser.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Newsletter/ViewInBrowser.php b/lib/Newsletter/ViewInBrowser.php index 100a3c2d87..7b58490bec 100644 --- a/lib/Newsletter/ViewInBrowser.php +++ b/lib/Newsletter/ViewInBrowser.php @@ -11,8 +11,8 @@ use MailPoet\Newsletter\Shortcodes\Shortcodes; class ViewInBrowser { static function view($data) { - $data = self::processData($data); - if(!$data) self::abort(); + $data = self::preProcessData($data); + if(!self::validateData($data)) self::abort(); $rendered_newsletter = self::getAndRenderNewsletter( $data->newsletter, @@ -25,7 +25,7 @@ class ViewInBrowser { exit; } - static function processData($data) { + static function preProcessData($data) { $data = (object)$data; if(empty($data->subscriber_id) || empty($data->subscriber_token) || @@ -38,11 +38,11 @@ class ViewInBrowser { $data->queue = ($data->queue_id) ? SendingQueue::findOne($data->queue_id) : false; - return self::validateData($data); + return $data; } static function validateData($data) { - if(!$data->subscriber || !$data->newsletter) return false; + if(!$data || !$data->subscriber || !$data->newsletter) return false; $subscriber_token_match = Subscriber::verifyToken($data->subscriber->email, $data->subscriber_token); if(!$subscriber_token_match) return false;