diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index 024136a8ea..f84e70d894 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -115,20 +115,6 @@ class Subscriber extends Model { return self::where('wp_user_id', $wp_user->ID)->findOne(); } - /** - * Only for backward compatibility for old tokens - */ - static function generateToken($email = null, $length = self::OBSOLETE_LINK_TOKEN_LENGTH) { - if ($email !== null) { - $auth_key = ''; - if (defined('AUTH_KEY')) { - $auth_key = AUTH_KEY; - } - return substr(md5($auth_key . $email), 0, $length); - } - return false; - } - function verifyToken($token) { $database_token = (new LinkTokens)->getToken($this); $request_token = substr($token, 0, strlen($database_token)); diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php index ed087000e4..aad0966e0f 100644 --- a/lib/Subscription/Pages.php +++ b/lib/Subscription/Pages.php @@ -288,7 +288,7 @@ class Pages { 'email' => self::DEMO_EMAIL, 'first_name' => 'John', 'last_name' => 'Doe', - 'link_token' => Subscriber::generateToken(self::DEMO_EMAIL), + 'link_token' => 'bfd0889dbc7f081e171fa0cee7401df2', ]); } else if ($this->subscriber !== false) { $subscriber = $this->subscriber diff --git a/tests/integration/Newsletter/Links/LinksTest.php b/tests/integration/Newsletter/Links/LinksTest.php index 5538d5d7ea..365592295f 100644 --- a/tests/integration/Newsletter/Links/LinksTest.php +++ b/tests/integration/Newsletter/Links/LinksTest.php @@ -119,7 +119,7 @@ class LinksTest extends \MailPoetTest { $subscriber_email = 'test@example.com'; $data = [ 'subscriber_id' => 1, - 'subscriber_token' => Subscriber::generateToken($subscriber_email), + 'subscriber_token' => md5($subscriber_email), 'queue_id' => 2, 'link_hash' => 'hash', 'preview' => false,