From 4ad17435f93e8729529a7cad1011fbeb185c1933 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 26 Jan 2021 13:45:57 +0000
Subject: [PATCH] Mail: Make sure the `SMTP` class is only required once if a
 plugin requires `wp-includes/class-smtp.php` directly.

Follow-up to [48033], [48530].

Props oellin, greatsaltlake, audrasjb.
Fixes #52369. See #50716, #41750.
Built from https://develop.svn.wordpress.org/trunk@50022


git-svn-id: http://core.svn.wordpress.org/trunk@49723 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-smtp.php | 2 +-
 wp-includes/version.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-smtp.php b/wp-includes/class-smtp.php
index 7b93997f73..524e655250 100644
--- a/wp-includes/class-smtp.php
+++ b/wp-includes/class-smtp.php
@@ -10,6 +10,6 @@ _deprecated_file(
 	__( 'The SMTP class has been moved to the wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace.' )
 );
 
-require __DIR__ . '/PHPMailer/SMTP.php';
+require_once __DIR__ . '/PHPMailer/SMTP.php';
 
 class_alias( PHPMailer\PHPMailer\SMTP::class, 'SMTP' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ceddee6f66..ddc84dfe14 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-50021';
+$wp_version = '5.7-alpha-50022';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.